2022-05-02 23:29:19

by Rohit Agarwal

[permalink] [raw]
Subject: [PATCH v2 0/4] Devicetree updates for Interconnect, USB3 and PHY support

Hello,

This series adds the devicetree nodes to support the interconnect, USB3 and PHY support.

Changes from v1:
- Addressed Krzysztof's comments.
- Rebased on top of 5.18-rc5.

Thanks,
Rohit.

Rohit Agarwal (4):
ARM: dts: qcom: sdx65: Add interconnect nodes
dt-bindings: usb: qcom,dwc3: Add binding for SDX65
ARM: dts: qcom: sdx65: Add USB3 and PHY support
ARM: dts: qcom: sdx65-mtp: Enable USB3 and PHY support

.../devicetree/bindings/usb/qcom,dwc3.yaml | 1 +
arch/arm/boot/dts/qcom-sdx65-mtp.dts | 29 +++++-
arch/arm/boot/dts/qcom-sdx65.dtsi | 108 +++++++++++++++++++++
3 files changed, 134 insertions(+), 4 deletions(-)

--
2.7.4


2022-05-02 23:36:40

by Rohit Agarwal

[permalink] [raw]
Subject: [PATCH v2 3/4] ARM: dts: qcom: sdx65: Add USB3 and PHY support

Add devicetree nodes for enabling USB3 controller, Qcom QMP PHY and
SNPS HS PHY on SDX65.

Signed-off-by: Rohit Agarwal <[email protected]>
---
arch/arm/boot/dts/qcom-sdx65.dtsi | 83 +++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi
index d989837..a64be20 100644
--- a/arch/arm/boot/dts/qcom-sdx65.dtsi
+++ b/arch/arm/boot/dts/qcom-sdx65.dtsi
@@ -126,6 +126,7 @@
reg = <0x00100000 0x001f7400>;
clocks = <&rpmhcc RPMH_CXO_CLK>, <&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>;
clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk";
+ #power-domain-cells = <1>;
#clock-cells = <1>;
#reset-cells = <1>;
};
@@ -139,6 +140,45 @@
status = "disabled";
};

+ usb_hsphy: phy@ff4000 {
+ compatible = "qcom,usb-snps-hs-7nm-phy";
+ reg = <0xff4000 0x120>;
+ #phy-cells = <0>;
+ status = "disabled";
+ clocks = <&rpmhcc RPMH_CXO_CLK>;
+ clock-names = "ref";
+ resets = <&gcc GCC_QUSB2PHY_BCR>;
+ };
+
+ usb_qmpphy: phy@ff6000 {
+ compatible = "qcom,sdx65-qmp-usb3-uni-phy";
+ reg = <0x00ff6000 0x1c8>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ clocks = <&gcc GCC_USB3_PHY_AUX_CLK>,
+ <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
+ <&gcc GCC_USB3_PRIM_CLKREF_EN>;
+ clock-names = "aux", "cfg_ahb", "ref";
+
+ resets = <&gcc GCC_USB3PHY_PHY_BCR>,
+ <&gcc GCC_USB3_PHY_BCR>;
+ reset-names = "phy", "common";
+
+ usb_ssphy: phy@ff6200 {
+ reg = <0x00ff6e00 0x160>,
+ <0x00ff7000 0x1ec>,
+ <0x00ff6200 0x1e00>;
+ #phy-cells = <0>;
+ #clock-cells = <0>;
+ clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>;
+ clock-names = "pipe0";
+ clock-output-names = "usb3_uni_phy_pipe_clk_src";
+ };
+ };
+
system_noc: interconnect@1620000 {
compatible = "qcom,sdx65-system-noc";
reg = <0x1620000 0x31200>;
@@ -178,6 +218,49 @@
status = "disabled";
};

+ usb: usb@a6f8800 {
+ compatible = "qcom,sdx65-dwc3", "qcom,dwc3";
+ reg = <0x0a6f8800 0x400>;
+ status = "disabled";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ clocks = <&gcc GCC_USB30_SLV_AHB_CLK>,
+ <&gcc GCC_USB30_MASTER_CLK>,
+ <&gcc GCC_USB30_MSTR_AXI_CLK>,
+ <&gcc GCC_USB30_MOCK_UTMI_CLK>,
+ <&gcc GCC_USB30_SLEEP_CLK>;
+ clock-names = "cfg_noc", "core", "iface", "mock_utmi",
+ "sleep";
+
+ assigned-clocks = <&gcc GCC_USB30_MOCK_UTMI_CLK>,
+ <&gcc GCC_USB30_MASTER_CLK>;
+ assigned-clock-rates = <19200000>, <200000000>;
+
+ interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+ <&pdc 19 IRQ_TYPE_EDGE_BOTH>,
+ <&pdc 76 IRQ_TYPE_LEVEL_HIGH>,
+ <&pdc 18 IRQ_TYPE_EDGE_BOTH>;
+ interrupt-names = "hs_phy_irq", "dp_hs_phy_irq",
+ "ss_phy_irq", "dm_hs_phy_irq";
+
+ power-domains = <&gcc USB30_GDSC>;
+
+ resets = <&gcc GCC_USB30_BCR>;
+
+ usb_dwc3: usb@a600000 {
+ compatible = "snps,dwc3";
+ reg = <0x0a600000 0xcd00>;
+ interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
+ iommus = <&apps_smmu 0x1a0 0x0>;
+ snps,dis_u2_susphy_quirk;
+ snps,dis_enblslpm_quirk;
+ phys = <&usb_hsphy>, <&usb_ssphy>;
+ phy-names = "usb2-phy", "usb3-phy";
+ };
+ };
+
spmi_bus: qcom,spmi@c440000 {
compatible = "qcom,spmi-pmic-arb";
reg = <0xc440000 0xd00>,
--
2.7.4

2022-05-03 01:17:19

by Rohit Agarwal

[permalink] [raw]
Subject: [PATCH v2 1/4] ARM: dts: qcom: sdx65: Add interconnect nodes

Add interconnect devicetree nodes in SDX65 platform.

Signed-off-by: Rohit Agarwal <[email protected]>
---
arch/arm/boot/dts/qcom-sdx65.dtsi | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi
index 57bda62..d989837 100644
--- a/arch/arm/boot/dts/qcom-sdx65.dtsi
+++ b/arch/arm/boot/dts/qcom-sdx65.dtsi
@@ -139,6 +139,26 @@
status = "disabled";
};

+ system_noc: interconnect@1620000 {
+ compatible = "qcom,sdx65-system-noc";
+ reg = <0x1620000 0x31200>;
+ #interconnect-cells = <1>;
+ qcom,bcm-voters = <&apps_bcm_voter>;
+ };
+
+ mem_noc: interconnect@9680000 {
+ compatible = "qcom,sdx65-mem-noc";
+ reg = <0x9680000 0x27200>;
+ #interconnect-cells = <1>;
+ qcom,bcm-voters = <&apps_bcm_voter>;
+ };
+
+ mc_virt: interconnect {
+ compatible = "qcom,sdx65-mc-virt";
+ #interconnect-cells = <1>;
+ qcom,bcm-voters = <&apps_bcm_voter>;
+ };
+
tcsr_mutex: hwlock@1f40000 {
compatible = "qcom,tcsr-mutex";
reg = <0x01f40000 0x40000>;
@@ -401,6 +421,11 @@
};
};
};
+
+ apps_bcm_voter: bcm-voter {
+ compatible = "qcom,bcm-voter";
+ };
+
};
};

--
2.7.4

2022-05-03 13:30:57

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH v2 1/4] ARM: dts: qcom: sdx65: Add interconnect nodes

On 02/05/2022 11:06, Rohit Agarwal wrote:
> Add interconnect devicetree nodes in SDX65 platform.
>
> Signed-off-by: Rohit Agarwal <[email protected]>
> ---
> arch/arm/boot/dts/qcom-sdx65.dtsi | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>


Acked-by: Krzysztof Kozlowski <[email protected]>


Best regards,
Krzysztof

2022-05-09 01:22:24

by Manivannan Sadhasivam

[permalink] [raw]
Subject: Re: [PATCH v2 3/4] ARM: dts: qcom: sdx65: Add USB3 and PHY support

On Thu, May 05, 2022 at 10:02:11PM +0200, Greg KH wrote:
> On Mon, May 02, 2022 at 02:36:34PM +0530, Rohit Agarwal wrote:
> > Add devicetree nodes for enabling USB3 controller, Qcom QMP PHY and
> > SNPS HS PHY on SDX65.
> >
> > Signed-off-by: Rohit Agarwal <[email protected]>
> > ---
> > arch/arm/boot/dts/qcom-sdx65.dtsi | 83 +++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 83 insertions(+)
>
> Does not apply to my tree :(

DTS patches are supposed to go through ARCH trees. So Bjorn will pick it
through linux-qcom.

Thanks,
Mani

--
மணிவண்ணன் சதாசிவம்

2022-05-09 05:02:56

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v2 3/4] ARM: dts: qcom: sdx65: Add USB3 and PHY support

On Mon, May 02, 2022 at 02:36:34PM +0530, Rohit Agarwal wrote:
> Add devicetree nodes for enabling USB3 controller, Qcom QMP PHY and
> SNPS HS PHY on SDX65.
>
> Signed-off-by: Rohit Agarwal <[email protected]>
> ---
> arch/arm/boot/dts/qcom-sdx65.dtsi | 83 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)

Does not apply to my tree :(

2022-05-09 06:47:13

by Manivannan Sadhasivam

[permalink] [raw]
Subject: Re: [PATCH v2 1/4] ARM: dts: qcom: sdx65: Add interconnect nodes

On Mon, May 02, 2022 at 02:36:32PM +0530, Rohit Agarwal wrote:
> Add interconnect devicetree nodes in SDX65 platform.
>
> Signed-off-by: Rohit Agarwal <[email protected]>
> ---
> arch/arm/boot/dts/qcom-sdx65.dtsi | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi
> index 57bda62..d989837 100644
> --- a/arch/arm/boot/dts/qcom-sdx65.dtsi
> +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi
> @@ -139,6 +139,26 @@
> status = "disabled";
> };
>
> + system_noc: interconnect@1620000 {
> + compatible = "qcom,sdx65-system-noc";
> + reg = <0x1620000 0x31200>;
> + #interconnect-cells = <1>;
> + qcom,bcm-voters = <&apps_bcm_voter>;
> + };
> +
> + mem_noc: interconnect@9680000 {
> + compatible = "qcom,sdx65-mem-noc";
> + reg = <0x9680000 0x27200>;
> + #interconnect-cells = <1>;
> + qcom,bcm-voters = <&apps_bcm_voter>;
> + };
> +
> + mc_virt: interconnect {

If there is no "reg" property then this virtual node should be moved outside of
"soc" node. Please refer sm8450.dtsi.

Also the rest of the interconnect nodes should be sorted. I know that you are
following sdx55, but the nodes were not fully sorted there :/

So please fix it too.

Thanks,
Mani

> + compatible = "qcom,sdx65-mc-virt";
> + #interconnect-cells = <1>;
> + qcom,bcm-voters = <&apps_bcm_voter>;
> + };
> +
> tcsr_mutex: hwlock@1f40000 {
> compatible = "qcom,tcsr-mutex";
> reg = <0x01f40000 0x40000>;
> @@ -401,6 +421,11 @@
> };
> };
> };
> +
> + apps_bcm_voter: bcm-voter {
> + compatible = "qcom,bcm-voter";
> + };
> +
> };
> };
>
> --
> 2.7.4
>

--
மணிவண்ணன் சதாசிவம்

2022-05-09 06:51:41

by Manivannan Sadhasivam

[permalink] [raw]
Subject: Re: [PATCH v2 3/4] ARM: dts: qcom: sdx65: Add USB3 and PHY support

On Mon, May 02, 2022 at 02:36:34PM +0530, Rohit Agarwal wrote:
> Add devicetree nodes for enabling USB3 controller, Qcom QMP PHY and
> SNPS HS PHY on SDX65.
>
> Signed-off-by: Rohit Agarwal <[email protected]>

Reviewed-by: Manivannan Sadhasivam <[email protected]>

Thanks,
Mani

> ---
> arch/arm/boot/dts/qcom-sdx65.dtsi | 83 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 83 insertions(+)
>
> diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi
> index d989837..a64be20 100644
> --- a/arch/arm/boot/dts/qcom-sdx65.dtsi
> +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi
> @@ -126,6 +126,7 @@
> reg = <0x00100000 0x001f7400>;
> clocks = <&rpmhcc RPMH_CXO_CLK>, <&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>;
> clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk";
> + #power-domain-cells = <1>;
> #clock-cells = <1>;
> #reset-cells = <1>;
> };
> @@ -139,6 +140,45 @@
> status = "disabled";
> };
>
> + usb_hsphy: phy@ff4000 {
> + compatible = "qcom,usb-snps-hs-7nm-phy";
> + reg = <0xff4000 0x120>;
> + #phy-cells = <0>;
> + status = "disabled";
> + clocks = <&rpmhcc RPMH_CXO_CLK>;
> + clock-names = "ref";
> + resets = <&gcc GCC_QUSB2PHY_BCR>;
> + };
> +
> + usb_qmpphy: phy@ff6000 {
> + compatible = "qcom,sdx65-qmp-usb3-uni-phy";
> + reg = <0x00ff6000 0x1c8>;
> + status = "disabled";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges;
> +
> + clocks = <&gcc GCC_USB3_PHY_AUX_CLK>,
> + <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
> + <&gcc GCC_USB3_PRIM_CLKREF_EN>;
> + clock-names = "aux", "cfg_ahb", "ref";
> +
> + resets = <&gcc GCC_USB3PHY_PHY_BCR>,
> + <&gcc GCC_USB3_PHY_BCR>;
> + reset-names = "phy", "common";
> +
> + usb_ssphy: phy@ff6200 {
> + reg = <0x00ff6e00 0x160>,
> + <0x00ff7000 0x1ec>,
> + <0x00ff6200 0x1e00>;
> + #phy-cells = <0>;
> + #clock-cells = <0>;
> + clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>;
> + clock-names = "pipe0";
> + clock-output-names = "usb3_uni_phy_pipe_clk_src";
> + };
> + };
> +
> system_noc: interconnect@1620000 {
> compatible = "qcom,sdx65-system-noc";
> reg = <0x1620000 0x31200>;
> @@ -178,6 +218,49 @@
> status = "disabled";
> };
>
> + usb: usb@a6f8800 {
> + compatible = "qcom,sdx65-dwc3", "qcom,dwc3";
> + reg = <0x0a6f8800 0x400>;
> + status = "disabled";
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges;
> +
> + clocks = <&gcc GCC_USB30_SLV_AHB_CLK>,
> + <&gcc GCC_USB30_MASTER_CLK>,
> + <&gcc GCC_USB30_MSTR_AXI_CLK>,
> + <&gcc GCC_USB30_MOCK_UTMI_CLK>,
> + <&gcc GCC_USB30_SLEEP_CLK>;
> + clock-names = "cfg_noc", "core", "iface", "mock_utmi",
> + "sleep";
> +
> + assigned-clocks = <&gcc GCC_USB30_MOCK_UTMI_CLK>,
> + <&gcc GCC_USB30_MASTER_CLK>;
> + assigned-clock-rates = <19200000>, <200000000>;
> +
> + interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
> + <&pdc 19 IRQ_TYPE_EDGE_BOTH>,
> + <&pdc 76 IRQ_TYPE_LEVEL_HIGH>,
> + <&pdc 18 IRQ_TYPE_EDGE_BOTH>;
> + interrupt-names = "hs_phy_irq", "dp_hs_phy_irq",
> + "ss_phy_irq", "dm_hs_phy_irq";
> +
> + power-domains = <&gcc USB30_GDSC>;
> +
> + resets = <&gcc GCC_USB30_BCR>;
> +
> + usb_dwc3: usb@a600000 {
> + compatible = "snps,dwc3";
> + reg = <0x0a600000 0xcd00>;
> + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
> + iommus = <&apps_smmu 0x1a0 0x0>;
> + snps,dis_u2_susphy_quirk;
> + snps,dis_enblslpm_quirk;
> + phys = <&usb_hsphy>, <&usb_ssphy>;
> + phy-names = "usb2-phy", "usb3-phy";
> + };
> + };
> +
> spmi_bus: qcom,spmi@c440000 {
> compatible = "qcom,spmi-pmic-arb";
> reg = <0xc440000 0xd00>,
> --
> 2.7.4
>

--
மணிவண்ணன் சதாசிவம்

2022-06-28 20:53:01

by Bjorn Andersson

[permalink] [raw]
Subject: Re: (subset) [PATCH v2 0/4] Devicetree updates for Interconnect, USB3 and PHY support

On Mon, 2 May 2022 14:36:31 +0530, Rohit Agarwal wrote:
> This series adds the devicetree nodes to support the interconnect, USB3 and PHY support.
>
> Changes from v1:
> - Addressed Krzysztof's comments.
> - Rebased on top of 5.18-rc5.
>
> Thanks,
> Rohit.
>
> [...]

Applied, thanks!

[1/4] ARM: dts: qcom: sdx65: Add interconnect nodes
commit: b456b5e7d1df276a4e1050680eec86ccb99d8a82
[3/4] ARM: dts: qcom: sdx65: Add USB3 and PHY support
commit: fbb6447deba87dc409e274d9d6d90d9c79851fb7
[4/4] ARM: dts: qcom: sdx65-mtp: Enable USB3 and PHY support
commit: eeaec4f2b926ffcb35a9c1c4af549ac9f7a6ce56

Best regards,
--
Bjorn Andersson <[email protected]>