arm64: dts: qcom: sc7280: Flatten usb controller nodes

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

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Tested-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> # FP5
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250728035812.2762957-1-krishna.kurapati@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
index e115b6a52b299ef663ccfb614785f8f89091f39d..f17ac3dc9b0653884006070e678880dc3365c3b4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
@@ -1364,12 +1364,10 @@
 };
 
 &usb_1 {
-       status = "okay";
-};
-
-&usb_1_dwc3 {
        dr_mode = "otg";
        usb-role-switch;
+
+       status = "okay";
 };
 
 &usb_1_dwc3_hs {

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
index 7a155ef6492e176390faa3f2dbe419f5cfa62f0d..8ed6e28b0c2977b831a1f156014eb9d6f70d0243 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts
@@ -751,12 +751,9 @@
 };
 
 &usb_1 {
-       status = "okay";
-};
-
-&usb_1_dwc3 {
-       /delete-property/ usb-role-switch;
        dr_mode = "peripheral";
+
+       status = "okay";
 };
 
 &usb_1_hsphy {

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
index b9a0f7ac4d9c9d17b6b404641acd5d79880fba79..eb8efba1b9dda422dd0295db2a52420a1a23d070 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
@@ -910,12 +910,10 @@
 };
 
 &usb_1 {
-       status = "okay";
-};
-
-&usb_1_dwc3 {
        dr_mode = "otg";
        usb-role-switch;
+
+       status = "okay";
 };
 
 &usb_1_dwc3_hs {

diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index 8f15be63394658a6168175a5d2183a7a77e34426..7509c27bd3f8f3e43877ded3b898205bdb66a847 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -1127,12 +1127,10 @@
 };
 
 &usb_1 {
-       status = "okay";
-};
-
-&usb_1_dwc3 {
        dr_mode = "otg";
        usb-role-switch;
+
+       status = "okay";
 };
 
 &usb_1_dwc3_hs {

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
index 2ba4ea60cb14736c9cfbf9f4a9048f20a4c921f2..5c5e4f1dd22173b64ab6b5e3fc2a1f7a98799bf6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
@@ -621,15 +621,13 @@ ap_ec_spi: &spi10 {
 };
 
 &usb_1 {
-       status = "okay";
-};
-
-&usb_1_dwc3 {
        dr_mode = "host";
 
        #address-cells = <1>;
        #size-cells = <0>;
 
+       status = "okay";
+
        /* 2.x hub on port 1 */
        usb_hub_2_x: hub@1 {
                compatible = "usbbda,5411";

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index b5fe7356be48983aa1fd7a02060b3e90331144ab..3103f94cd685c3162ba91951d8e77592e40fd645 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -81,11 +81,9 @@
 };
 
 &usb_2 {
-       status = "okay";
-};
-
-&usb_2_dwc3 {
        dr_mode = "otg";
+
+       status = "okay";
 };
 
 &usb_2_hsphy {

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 90e5b9ab5b847edc447111825999f73f6453b33a..ccd39a1baeda543b7d98d81c84dc79dfc990123b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -520,11 +520,9 @@
 };
 
 &usb_1 {
-       status = "okay";
-};
-
-&usb_1_dwc3 {
        dr_mode = "host";
+
+       status = "okay";
 };
 
 &usb_1_hsphy {

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 64a2abd3010018e94eb50c534a509d6b4cf2473b..0fa8d34999a3b477e010cd4633e14888dd399346 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -3711,14 +3711,10 @@
                        };
                };
 
-               usb_2: usb@8cf8800 {
-                       compatible = "qcom,sc7280-dwc3", "qcom,dwc3";
-                       reg = <0 0x08cf8800 0 0x400>;
+               usb_2: usb@8c00000 {
+                       compatible = "qcom,sc7280-dwc3", "qcom,snps-dwc3";
+                       reg = <0 0x08c00000 0 0xfc100>;
                        status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-                       dma-ranges;
 
                        clocks = <&gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>,
                                 <&gcc GCC_USB30_SEC_MASTER_CLK>,
@@ -3735,11 +3731,13 @@
                                          <&gcc GCC_USB30_SEC_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <200000000>;
 
-                       interrupts-extended = <&intc GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&intc GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>,
                                              <&intc GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>,
                                              <&pdc 12 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 13 IRQ_TYPE_EDGE_BOTH>;
-                       interrupt-names = "pwr_event",
+                       interrupt-names = "dwc_usb3",
+                                         "pwr_event",
                                          "hs_phy_irq",
                                          "dp_hs_phy_irq",
                                          "dm_hs_phy_irq";
@@ -3753,24 +3751,19 @@
                                        <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_USB2 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
 
-                       usb_2_dwc3: usb@8c00000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x08c00000 0 0xe000>;
-                               interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0xa0 0x0>;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_enblslpm_quirk;
-                               snps,dis-u1-entry-quirk;
-                               snps,dis-u2-entry-quirk;
-                               phys = <&usb_2_hsphy>;
-                               phy-names = "usb2-phy";
-                               maximum-speed = "high-speed";
-                               usb-role-switch;
+                       iommus = <&apps_smmu 0xa0 0x0>;
+                       snps,dis_u2_susphy_quirk;
+                       snps,dis_enblslpm_quirk;
+                       snps,dis-u1-entry-quirk;
+                       snps,dis-u2-entry-quirk;
+                       phys = <&usb_2_hsphy>;
+                       phy-names = "usb2-phy";
+                       maximum-speed = "high-speed";
+                       usb-role-switch;
 
-                               port {
-                                       usb2_role_switch: endpoint {
-                                               remote-endpoint = <&eud_ep>;
-                                       };
+                       port {
+                               usb2_role_switch: endpoint {
+                                       remote-endpoint = <&eud_ep>;
                                };
                        };
                };
@@ -4252,14 +4245,10 @@
                        };
                };
 
-               usb_1: usb@a6f8800 {
-                       compatible = "qcom,sc7280-dwc3", "qcom,dwc3";
-                       reg = <0 0x0a6f8800 0 0x400>;
+               usb_1: usb@a600000 {
+                       compatible = "qcom,sc7280-dwc3", "qcom,snps-dwc3";
+                       reg = <0 0x0a600000 0 0xfc100>;
                        status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-                       dma-ranges;
 
                        clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
                                 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
@@ -4276,12 +4265,14 @@
                                          <&gcc GCC_USB30_PRIM_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <200000000>;
 
-                       interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
                                              <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
                                              <&pdc 14 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 17 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "pwr_event",
+                       interrupt-names = "dwc_usb3",
+                                         "pwr_event",
                                          "hs_phy_irq",
                                          "dp_hs_phy_irq",
                                          "dm_hs_phy_irq",
@@ -4298,37 +4289,32 @@
 
                        wakeup-source;
 
-                       usb_1_dwc3: usb@a600000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x0a600000 0 0xe000>;
-                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0xe0 0x0>;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_enblslpm_quirk;
-                               snps,parkmode-disable-ss-quirk;
-                               snps,dis-u1-entry-quirk;
-                               snps,dis-u2-entry-quirk;
-                               phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
-                               phy-names = "usb2-phy", "usb3-phy";
-                               maximum-speed = "super-speed";
+                       iommus = <&apps_smmu 0xe0 0x0>;
+                       snps,dis_u2_susphy_quirk;
+                       snps,dis_enblslpm_quirk;
+                       snps,parkmode-disable-ss-quirk;
+                       snps,dis-u1-entry-quirk;
+                       snps,dis-u2-entry-quirk;
+                       phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>;
+                       phy-names = "usb2-phy", "usb3-phy";
+                       maximum-speed = "super-speed";
 
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
 
-                                       port@0 {
-                                               reg = <0>;
+                               port@0 {
+                                       reg = <0>;
 
-                                               usb_1_dwc3_hs: endpoint {
-                                               };
+                                       usb_1_dwc3_hs: endpoint {
                                        };
+                               };
 
-                                       port@1 {
-                                               reg = <1>;
+                               port@1 {
+                                       reg = <1>;
 
-                                               usb_1_dwc3_ss: endpoint {
-                                                       remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
-                                               };
+                                       usb_1_dwc3_ss: endpoint {
+                                               remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
                                        };
                                };
                        };

diff --git a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
index befbb40228b51ad2771a4c0e6799d26045af5917..f16b47b6a74c5f16657be1cb1e1dc03afedb1167 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
+++ b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
@@ -1425,16 +1425,14 @@
 &usb_1 {
        /* USB 2.0 only */
        qcom,select-utmi-as-pipe-clk;
-       status = "okay";
-};
-
-&usb_1_dwc3 {
        dr_mode = "otg";
        usb-role-switch;
        maximum-speed = "high-speed";
        /* Remove USB3 phy */
        phys = <&usb_1_hsphy>;
        phy-names = "usb2-phy";
+
+       status = "okay";
 };
 
 &usb_1_dwc3_hs {