arm64: dts: qcom: sdx75: Flatten usb controller node

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

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251114061553.512441-2-krishna.kurapati@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sdx75-idp.dts b/arch/arm64/boot/dts/qcom/sdx75-idp.dts
index 06cacec3461f13f1c1b9619cfdee275d21f84e06..6696e1aee2436c8efd726dd8259a0d9306a0ab0e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdx75-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sdx75-idp.dts
@@ -337,11 +337,9 @@
 };
 
 &usb {
-       status = "okay";
-};
-
-&usb_dwc3 {
        dr_mode = "peripheral";
+
+       status = "okay";
 };
 
 &usb_hsphy {

diff --git a/arch/arm64/boot/dts/qcom/sdx75.dtsi b/arch/arm64/boot/dts/qcom/sdx75.dtsi
index f26ba90ba66d3ffbdbbb34cc6fdbc716c8c5fcb3..e586b55c155bd0af4306a7e4ecafa1bd1066e0b3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdx75.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdx75.dtsi
@@ -1019,12 +1019,9 @@
                        };
                };
 
-               usb: usb@a6f8800 {
-                       compatible = "qcom,sdx75-dwc3", "qcom,dwc3";
-                       reg = <0x0 0x0a6f8800 0x0 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               usb: usb@a600000 {
+                       compatible = "qcom,sdx75-dwc3", "qcom,snps-dwc3";
+                       reg = <0x0 0x0a600000 0x0 0xfc100>;
 
                        clocks = <&gcc GCC_USB30_SLV_AHB_CLK>,
                                 <&gcc GCC_USB30_MASTER_CLK>,
@@ -1041,21 +1038,35 @@
                                          <&gcc GCC_USB30_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 10 IRQ_TYPE_EDGE_RISING>,
                                              <&pdc 9 IRQ_TYPE_EDGE_RISING>,
                                              <&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",
                                          "ss_phy_irq";
 
+                       iommus = <&apps_smmu 0x80 0x0>;
+
+                       snps,dis_u2_susphy_quirk;
+                       snps,dis_enblslpm_quirk;
+                       snps,dis-u1-entry-quirk;
+                       snps,dis-u2-entry-quirk;
+
                        power-domains = <&gcc GCC_USB30_GDSC>;
 
                        resets = <&gcc GCC_USB30_BCR>;
 
+                       phys = <&usb_hsphy>,
+                              <&usb_qmpphy>;
+                       phy-names = "usb2-phy",
+                                   "usb3-phy";
+
                        interconnects = <&system_noc MASTER_USB3_0 QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
                                        <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
@@ -1065,36 +1076,21 @@
 
                        status = "disabled";
 
-                       usb_dwc3: usb@a600000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x0 0x0a600000 0x0 0xcd00>;
-                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0x80 0x0>;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_enblslpm_quirk;
-                               snps,dis-u1-entry-quirk;
-                               snps,dis-u2-entry-quirk;
-                               phys = <&usb_hsphy>,
-                                      <&usb_qmpphy>;
-                               phy-names = "usb2-phy",
-                                           "usb3-phy";
-
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       port@0 {
-                                               reg = <0>;
-
-                                               usb_1_dwc3_hs: endpoint {
-                                               };
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+
+                                       usb_1_dwc3_hs: endpoint {
                                        };
+                               };
 
-                                       port@1 {
-                                               reg = <1>;
+                               port@1 {
+                                       reg = <1>;
 
-                                               usb_1_dwc3_ss: endpoint {
-                                               };
+                                       usb_1_dwc3_ss: endpoint {
                                        };
                                };
                        };