On 22-11-16 14:37:36, Johan Hovold wrote:
> On Wed, Nov 16, 2022 at 03:04:29PM +0200, Abel Vesa wrote:
> > Add PCIe controllers and PHY nodes.
> >
> > Signed-off-by: Abel Vesa <abel.vesa@xxxxxxxxxx>
> > ---
> > arch/arm64/boot/dts/qcom/sm8550.dtsi | 245 +++++++++++++++++++++++++++
> > 1 file changed, 245 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> > index 07ba709ca35f..5c274d0372ad 100644
> > --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
> <&ufs_phy_rx_symbol_1_clk>,
> > @@ -1372,6 +1376,247 @@ mmss_noc: interconnect@1780000 {
> > qcom,bcm-voters = <&apps_bcm_voter>;
> > };
> >
> > + pcie0: pci@1c00000 {
> > + compatible = "qcom,pcie-sm8550-pcie0";
> > + reg = <0 0x01c00000 0 0x3000>,
> > + <0 0x60000000 0 0xf1d>,
> > + <0 0x60000f20 0 0xa8>,
> > + <0 0x60001000 0 0x1000>,
> > + <0 0x60100000 0 0x100000>;
> > + reg-names = "parf", "dbi", "elbi", "atu", "config";
> > + device_type = "pci";
> > + linux,pci-domain = <0>;
> > + bus-range = <0x00 0xff>;
> > + num-lanes = <2>;
> > +
> > + #address-cells = <3>;
> > + #size-cells = <2>;
> > +
> > + ranges = <0x01000000 0x0 0x60200000 0 0x60200000 0x0 0x100000>,
> > + <0x02000000 0x0 0x60300000 0 0x60300000 0x0 0x3d00000>;
> > +
> > + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
> > + interrupt-names = "msi";
> > + #interrupt-cells = <1>;
> > + interrupt-map-mask = <0 0 0 0x7>;
> > + interrupt-map = <0 0 0 1 &intc 0 0 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
> > + <0 0 0 2 &intc 0 0 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
> > + <0 0 0 3 &intc 0 0 0 151 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
> > + <0 0 0 4 &intc 0 0 0 152 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
> > +
> > + interconnect-names = "icc_path";
> > + interconnects = <&pcie_noc MASTER_PCIE_0 0 &mc_virt SLAVE_EBI1 0>;
> > +
> > + clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,
> > + <&gcc GCC_PCIE_0_PIPE_CLK_SRC>,
> > + <&pcie0_lane>,
> > + <&rpmhcc RPMH_CXO_CLK>,
>
> As I mentioned in my comment to the binding, the above three clocks
> should not be here but rather be handled by the clock driver.
Sure, will do.
>
> > + <&gcc GCC_PCIE_0_AUX_CLK>,
> > + <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
> > + <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,
> > + <&gcc GCC_PCIE_0_SLV_AXI_CLK>,
> > + <&gcc GCC_PCIE_0_SLV_Q2A_AXI_CLK>,
> > + <&gcc GCC_DDRSS_PCIE_SF_QTB_CLK>,
> > + <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>;
> > + clock-names = "pipe",
> > + "pipe_mux",
> > + "phy_pipe",
> > + "ref",
> > + "aux",
> > + "cfg",
> > + "bus_master",
> > + "bus_slave",
> > + "slave_q2a",
> > + "ddrss_sf_tbu",
> > + "aggre0";
> > +
> > + iommus = <&apps_smmu 0x1400 0x7f>;
> > + iommu-map = <0x0 &apps_smmu 0x1400 0x1>,
> > + <0x100 &apps_smmu 0x1401 0x1>;
> > +
> > + resets = <&gcc GCC_PCIE_0_BCR>;
> > + reset-names = "pci";
> > +
> > + power-domains = <&gcc PCIE_0_GDSC>;
> > + power-domain-names = "gdsc";
> > +
> > + phys = <&pcie0_lane>;
> > + phy-names = "pciephy";
> > +
> > + perst-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>;
> > + wake-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>;
> > +
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pcie0_default_state>;
> > +
> > + status = "disabled";
> > + };
> > +
> > + pcie0_phy: phy@1c06000 {
> > + compatible = "qcom,sm8550-qmp-gen3x2-pcie-phy";
>
> Where's the corresponding binding update?
>
Here:
https://lore.kernel.org/all/20221116120157.2706810-7-abel.vesa@xxxxxxxxxx/
> > + reg = <0 0x01c06000 0 0x200>;
> > + #address-cells = <2>;
> > + #size-cells = <2>;
> > + ranges;
> > + clocks = <&gcc GCC_PCIE_0_AUX_CLK>,
> > + <&gcc GCC_PCIE_0_CFG_AHB_CLK>,
> > + <&tcsr TCSR_PCIE_0_CLKREF_EN>,
> > + <&gcc GCC_PCIE_0_PHY_RCHNG_CLK>;
> > + clock-names = "aux", "cfg_ahb", "ref", "refgen";
> > +
> > + resets = <&gcc GCC_PCIE_0_PHY_BCR>;
> > + reset-names = "phy";
> > +
> > + assigned-clocks = <&gcc GCC_PCIE_0_PHY_RCHNG_CLK>;
> > + assigned-clock-rates = <100000000>;
> > +
> > + power-domains = <&gcc PCIE_0_PHY_GDSC>;
> > + power-domain-names = "gdsc";
> > +
> > + status = "disabled";
> > +
> > + pcie0_lane: phy@1c06200 {
> > + reg = <0 0x1c06e00 0 0x200>, /* tx0 */
> > + <0 0x1c07000 0 0x200>, /* rx0 */
> > + <0 0x1c06200 0 0x200>, /* pcs */
> > + <0 0x1c07600 0 0x200>, /* tx1 */
> > + <0 0x1c07800 0 0x200>, /* rx1 */
> > + <0 0x1c06600 0 0x200>; /* pcs_pcie */
> > + clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
> > + clock-names = "pipe0";
> > +
> > + #clock-cells = <0>;
> > + #phy-cells = <0>;
> > + clock-output-names = "pcie_0_pipe_clk";
> > + };
>
> These PHY nodes should also be updated to the new binding scheme which
> drops the child node and individual register descriptions (cf.
> sc8280xp).
Sure, will do.
>
> Johan
