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

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

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250715052739.3831549-3-krishna.kurapati@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
index 2ff40a120aadf9e7556bb568b5c99847584189fa..0c6aa7ddf43263f30595b3f0733ec3e126e38608 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
@@ -1199,11 +1199,6 @@
        status = "okay";
 };
 
-&usb_1_dwc3 {
-       dr_mode = "otg";
-       usb-role-switch;
-};
-
 &usb_1_dwc3_hs {
        remote-endpoint = <&pmic_glink_hs_in>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
index cc1335a07a35c7a4239d684f978d958f7d47f533..6bd315e1099253aa890ce282446b69ce62c5de90 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi
@@ -781,11 +781,8 @@
 };
 
 &usb_1 {
-       status = "okay";
-};
-
-&usb_1_dwc3 {
        dr_mode = "peripheral";
+       status = "okay";
 };
 
 &usb_1_hsphy {

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 33574ad706b915136546c7f92c7cd0b8a0d62b7e..2baef6869ed7c17efb239e86013c15ef6ef5f48f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -5418,12 +5418,9 @@
                };
 
                usb_1: usb@a6f8800 {
-                       compatible = "qcom,sm8450-dwc3", "qcom,dwc3";
-                       reg = <0 0x0a6f8800 0 0x400>;
+                       compatible = "qcom,sm8450-dwc3", "qcom,snps-dwc3";
+                       reg = <0 0x0a600000 0 0xfc100>;
                        status = "disabled";
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
 
                        clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
                                 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
@@ -5442,12 +5439,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",
@@ -5461,36 +5460,32 @@
                                        <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
 
-                       usb_1_dwc3: usb@a600000 {
-                               compatible = "snps,dwc3";
-                               reg = <0 0x0a600000 0 0xcd00>;
-                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0x0 0x0>;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_u3_susphy_quirk;
-                               snps,dis_enblslpm_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";
+                       iommus = <&apps_smmu 0x0 0x0>;
+                       snps,dis_u2_susphy_quirk;
+                       snps,dis_u3_susphy_quirk;
+                       snps,dis_enblslpm_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";
+                       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_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_1_qmpphy_usb_ss_in>;
-                                               };
+                                       usb_1_dwc3_ss: endpoint {
+                                               remote-endpoint = <&usb_1_qmpphy_usb_ss_in>;
                                        };
                                };
                        };