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

Flatten usb controller nodes and update to using latest bindings and
flattened driver approach. Enumeration of ADB has been tested on EVK
Platform.

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

diff --git a/arch/arm64/boot/dts/qcom/lemans-evk.dts b/arch/arm64/boot/dts/qcom/lemans-evk.dts
index d5dbcbd86171910adb5258073694d476ed66be5d..c7dc9b8f445787a87ba4869bb426f70f14c1dc9f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/lemans-evk.dts
+++ b/arch/arm64/boot/dts/qcom/lemans-evk.dts
@@ -751,11 +751,9 @@
 };
 
 &usb_0 {
-       status = "okay";
-};
-
-&usb_0_dwc3 {
        dr_mode = "peripheral";
+
+       status = "okay";
 };
 
 &usb_0_hsphy {

diff --git a/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi b/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
index 25e756c141606fbe0876ed48a54809b372650903..c69aa2f41ce29f9f841cc6e6651a8efc38690e19 100644 (file)
--- a/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
@@ -997,14 +997,11 @@
 &usb_0 {
        pinctrl-names = "default";
        pinctrl-0 = <&usb0_en_state>;
+       dr_mode = "peripheral";
 
        status = "okay";
 };
 
-&usb_0_dwc3 {
-       dr_mode = "peripheral";
-};
-
 &usb_0_hsphy {
        vdda-pll-supply = <&vreg_l7a>;
        vdda18-supply = <&vreg_l6c>;
@@ -1023,14 +1020,11 @@
 &usb_1 {
        pinctrl-names = "default";
        pinctrl-0 = <&usb1_en_state>;
+       dr_mode = "host";
 
        status = "okay";
 };
 
-&usb_1_dwc3 {
-       dr_mode = "host";
-};
-
 &usb_1_hsphy {
        vdda-pll-supply = <&vreg_l7a>;
        vdda18-supply = <&vreg_l6c>;
@@ -1049,14 +1043,11 @@
 &usb_2 {
        pinctrl-names = "default";
        pinctrl-0 = <&usb2_en_state>;
+       dr_mode = "host";
 
        status = "okay";
 };
 
-&usb_2_dwc3 {
-       dr_mode = "host";
-};
-
 &usb_2_hsphy {
        vdda-pll-supply = <&vreg_l7a>;
        vdda18-supply = <&vreg_l6c>;

diff --git a/arch/arm64/boot/dts/qcom/lemans.dtsi b/arch/arm64/boot/dts/qcom/lemans.dtsi
index 4e6b42731d64912a5483bcbdb2ed679ed9f4f3b2..48f753002fc459a3e9fac0c0e98cbec6013fea0f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/lemans.dtsi
+++ b/arch/arm64/boot/dts/qcom/lemans.dtsi
@@ -3925,12 +3925,9 @@
                        status = "disabled";
                };
 
-               usb_0: usb@a6f8800 {
-                       compatible = "qcom,sa8775p-dwc3", "qcom,dwc3";
-                       reg = <0 0x0a6f8800 0 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               usb_0: usb@a600000 {
+                       compatible = "qcom,sa8775p-dwc3", "qcom,snps-dwc3";
+                       reg = <0 0x0a600000 0 0xfc100>;
 
                        clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
                                 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
@@ -3943,12 +3940,14 @@
                                          <&gcc GCC_USB30_PRIM_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <200000000>;
 
-                       interrupts-extended = <&intc GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 292 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&intc GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>,
                                              <&intc GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>,
                                              <&pdc 14 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 12 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",
@@ -3965,18 +3964,13 @@
 
                        wakeup-source;
 
-                       status = "disabled";
+                       iommus = <&apps_smmu 0x080 0x0>;
+                       phys = <&usb_0_hsphy>, <&usb_0_qmpphy>;
+                       phy-names = "usb2-phy", "usb3-phy";
+                       snps,dis-u1-entry-quirk;
+                       snps,dis-u2-entry-quirk;
 
-                       usb_0_dwc3: usb@a600000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x0a600000 0 0xe000>;
-                               interrupts = <GIC_SPI 292 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0x080 0x0>;
-                               phys = <&usb_0_hsphy>, <&usb_0_qmpphy>;
-                               phy-names = "usb2-phy", "usb3-phy";
-                               snps,dis-u1-entry-quirk;
-                               snps,dis-u2-entry-quirk;
-                       };
+                       status = "disabled";
                };
 
                usb_1_hsphy: phy@88e6000 {
@@ -4016,12 +4010,9 @@
                        status = "disabled";
                };
 
-               usb_1: usb@a8f8800 {
-                       compatible = "qcom,sa8775p-dwc3", "qcom,dwc3";
-                       reg = <0 0x0a8f8800 0 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               usb_1: usb@a800000 {
+                       compatible = "qcom,sa8775p-dwc3", "qcom,snps-dwc3";
+                       reg = <0 0x0a800000 0 0xfc100>;
 
                        clocks = <&gcc GCC_CFG_NOC_USB3_SEC_AXI_CLK>,
                                 <&gcc GCC_USB30_SEC_MASTER_CLK>,
@@ -4034,12 +4025,14 @@
                                          <&gcc GCC_USB30_SEC_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <200000000>;
 
-                       interrupts-extended = <&intc GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&intc GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>,
                                              <&intc GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,
                                              <&pdc 8 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 7 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 13 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",
@@ -4056,18 +4049,13 @@
 
                        wakeup-source;
 
-                       status = "disabled";
+                       iommus = <&apps_smmu 0x0a0 0x0>;
+                       phys = <&usb_1_hsphy>, <&usb_1_qmpphy>;
+                       phy-names = "usb2-phy", "usb3-phy";
+                       snps,dis-u1-entry-quirk;
+                       snps,dis-u2-entry-quirk;
 
-                       usb_1_dwc3: usb@a800000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x0a800000 0 0xe000>;
-                               interrupts = <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0x0a0 0x0>;
-                               phys = <&usb_1_hsphy>, <&usb_1_qmpphy>;
-                               phy-names = "usb2-phy", "usb3-phy";
-                               snps,dis-u1-entry-quirk;
-                               snps,dis-u2-entry-quirk;
-                       };
+                       status = "disabled";
                };
 
                usb_2_hsphy: phy@88e7000 {
@@ -4083,12 +4071,9 @@
                        status = "disabled";
                };
 
-               usb_2: usb@a4f8800 {
-                       compatible = "qcom,sa8775p-dwc3", "qcom,dwc3";
-                       reg = <0 0x0a4f8800 0 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               usb_2: usb@a400000 {
+                       compatible = "qcom,sa8775p-dwc3", "qcom,snps-dwc3";
+                       reg = <0 0x0a400000 0 0xfc100>;
 
                        clocks = <&gcc GCC_CFG_NOC_USB2_PRIM_AXI_CLK>,
                                 <&gcc GCC_USB20_MASTER_CLK>,
@@ -4101,11 +4086,13 @@
                                          <&gcc GCC_USB20_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <200000000>;
 
-                       interrupts-extended = <&intc GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 442 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&intc GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>,
                                              <&intc GIC_SPI 443 IRQ_TYPE_LEVEL_HIGH>,
                                              <&pdc 10 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 9 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";
@@ -4121,18 +4108,13 @@
 
                        wakeup-source;
 
-                       status = "disabled";
+                       iommus = <&apps_smmu 0x020 0x0>;
+                       phys = <&usb_2_hsphy>;
+                       phy-names = "usb2-phy";
+                       snps,dis-u1-entry-quirk;
+                       snps,dis-u2-entry-quirk;
 
-                       usb_2_dwc3: usb@a400000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x0a400000 0 0xe000>;
-                               interrupts = <GIC_SPI 442 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0x020 0x0>;
-                               phys = <&usb_2_hsphy>;
-                               phy-names = "usb2-phy";
-                               snps,dis-u1-entry-quirk;
-                               snps,dis-u2-entry-quirk;
-                       };
+                       status = "disabled";
                };
 
                tcsr_mutex: hwlock@1f40000 {