[PATCH] arm64: dts: qcom: agatti: Flatten the USB node

[PATCH] arm64: dts: qcom: agatti: Flatten the USB node

[Konrad Dybcio]

From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Flatten usb controller nodes and update to using latest bindings
and flattened driver approach.

Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
I tested s2idle sus/res on the Uno Q and it passed without issues that
popped up on some other platforms.
---
 arch/arm64/boot/dts/qcom/agatti.dtsi | 76 ++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/agatti.dtsi b/arch/arm64/boot/dts/qcom/agatti.dtsi
index 590bd2432d85..e7fed60a59d9 100644
--- a/arch/arm64/boot/dts/qcom/agatti.dtsi
+++ b/arch/arm64/boot/dts/qcom/agatti.dtsi
@@ -1572,12 +1572,15 @@ &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
 			};
 		};
 
-		usb: usb@4ef8800 {
-			compatible = "qcom,qcm2290-dwc3", "qcom,dwc3";
-			reg = <0x0 0x04ef8800 0x0 0x400>;
-			interrupts-extended = <&intc GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+		usb: usb@4e00000 {
+			compatible = "qcom,qcm2290-dwc3", "qcom,snps-dwc3";
+			reg = <0x0 0x04e00000 0x0 0xfc100>;
+
+			interrupts-extended = <&intc GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>,
+					      <&intc GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
 					      <&mpm 12 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "hs_phy_irq",
+			interrupt-names = "dwc_usb3",
+					  "hs_phy_irq",
 					  "ss_phy_irq";
 
 			clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
@@ -1595,7 +1598,8 @@ usb: usb@4ef8800 {
 
 			assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
 					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;
-			assigned-clock-rates = <19200000>, <133333333>;
+			assigned-clock-rates = <19200000>,
+					       <133333333>;
 
 			resets = <&gcc GCC_USB30_PRIM_BCR>;
 			power-domains = <&gcc GCC_USB30_PRIM_GDSC>;
@@ -1606,48 +1610,42 @@ &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
 					 &config_noc SLAVE_USB3 RPM_ALWAYS_TAG>;
 			interconnect-names = "usb-ddr",
 					     "apps-usb";
-			wakeup-source;
 
-			#address-cells = <2>;
-			#size-cells = <2>;
-			ranges;
+			iommus = <&apps_smmu 0x120 0x0>;
+
+			phys = <&usb_hsphy>,
+			       <&usb_qmpphy>;
+			phy-names = "usb2-phy",
+				    "usb3-phy";
+
+			snps,hird-threshold = /bits/ 8 <0x10>;
+			snps,parkmode-disable-ss-quirk;
+			snps,dis_u2_susphy_quirk;
+			snps,dis_enblslpm_quirk;
+			snps,has-lpm-erratum;
+			snps,usb3_lpm_capable;
+
+			usb-role-switch;
+			wakeup-source;
 
 			status = "disabled";
 
-			usb_dwc3: usb@4e00000 {
-				compatible = "snps,dwc3";
-				reg = <0x0 0x04e00000 0x0 0xcd00>;
-				interrupts = <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
-				phys = <&usb_hsphy>, <&usb_qmpphy>;
-				phy-names = "usb2-phy", "usb3-phy";
-				iommus = <&apps_smmu 0x120 0x0>;
-				snps,dis_u2_susphy_quirk;
-				snps,dis_enblslpm_quirk;
-				snps,has-lpm-erratum;
-				snps,hird-threshold = /bits/ 8 <0x10>;
-				snps,usb3_lpm_capable;
-				snps,parkmode-disable-ss-quirk;
-				maximum-speed = "super-speed";
-				dr_mode = "otg";
-				usb-role-switch;
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
 
-				ports {
-					#address-cells = <1>;
-					#size-cells = <0>;
+				port@0 {
+					reg = <0>;
 
-					port@0 {
-						reg = <0>;
-
-						usb_dwc3_hs: endpoint {
-						};
+					usb_dwc3_hs: endpoint {
 					};
+				};
 
-					port@1 {
-						reg = <1>;
+				port@1 {
+					reg = <1>;
 
-						usb_dwc3_ss: endpoint {
-							remote-endpoint = <&usb_qmpphy_usb_ss_in>;
-						};
+					usb_dwc3_ss: endpoint {
+						remote-endpoint = <&usb_qmpphy_usb_ss_in>;
 					};
 				};
 			};

---
base-commit: 6a746cd265aed59107ebdaa9ce039bb832922969
change-id: 20260820-topic-agatti_flatten-2b12516f1b0e

Best regards,
--  
Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Re: [PATCH] arm64: dts: qcom: agatti: Flatten the USB node

[Abel Vesa]

On 26-08-20 14:37:16, Konrad Dybcio wrote:
> From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> 
> Flatten usb controller nodes and update to using latest bindings
> and flattened driver approach.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>

Re: [PATCH] arm64: dts: qcom: agatti: Flatten the USB node

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Missing `dr_mode` and `maximum-speed` properties in the flattened USB node
--

--- Patch [1]: [PATCH] arm64: dts: qcom: agatti: Flatten the USB node ---
commit 0427bd1800c10434e0638f89470c4f8172cd92b9
Author: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

arm64: dts: qcom: agatti: Flatten the USB node

This commit updates the USB controller node in the agatti device tree
by flattening it to use the latest bindings and flattened driver approach.

> diff --git a/arch/arm64/boot/dts/qcom/agatti.dtsi b/arch/arm64/boot/dts/qcom/agatti.dtsi
> index 590bd2432d85b..e7fed60a59d93 100644
> --- a/arch/arm64/boot/dts/qcom/agatti.dtsi
> +++ b/arch/arm64/boot/dts/qcom/agatti.dtsi
[ ... ]
> @@ -1606,48 +1610,42 @@ &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
[ ... ]
> -			usb_dwc3: usb@4e00000 {
> -				compatible = "snps,dwc3";
> -				reg = <0x0 0x04e00000 0x0 0xcd00>;
> -				interrupts = <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
> -				phys = <&usb_hsphy>, <&usb_qmpphy>;
> -				phy-names = "usb2-phy", "usb3-phy";
> -				iommus = <&apps_smmu 0x120 0x0>;
> -				snps,dis_u2_susphy_quirk;
> -				snps,dis_enblslpm_quirk;
> -				snps,has-lpm-erratum;
> -				snps,hird-threshold = /bits/ 8 <0x10>;
> -				snps,usb3_lpm_capable;
> -				snps,parkmode-disable-ss-quirk;
> -				maximum-speed = "super-speed";
> -				dr_mode = "otg";
> -				usb-role-switch;
> +			snps,hird-threshold = /bits/ 8 <0x10>;
> +			snps,parkmode-disable-ss-quirk;
> +			snps,dis_u2_susphy_quirk;
> +			snps,dis_enblslpm_quirk;
> +			snps,has-lpm-erratum;
> +			snps,usb3_lpm_capable;
>  
> +			usb-role-switch;
> +			wakeup-source;
>  
> +			status = "disabled";

[Severity: High]
Were the maximum-speed and dr_mode properties intentionally dropped when
flattening this node?

The previous usb_dwc3 child node defined dr_mode = "otg" and 
maximum-speed = "super-speed", but they appear to be missing from the
newly flattened usb: usb@4e00000 node. 

Could dropping dr_mode cause the USB controller to fail to initialize
role-switching properly and break OTG functionality on boards utilizing
this SoC?

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260820-topic-agatti_flatten-v1-1-ba9dcab9dc2c@oss.qualcomm.com?part=1