arm64: dts: qcom: correct DWC3 node names and unit addresses

Align DWC3 USB node names with DT schema ("usb" is expected) and correct
the unit addresses to match the "reg" property.  This also implies
overriding nodes by label, instead of full path.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220504131923.214367-7-krzysztof.kozlowski@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index f623db8451f1c8acdac509d8179ce609da355370..7e9af10f292e5475659ead42209ba807f33605a8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -1046,22 +1046,22 @@
 &usb2 {
        status = "okay";
        extcon = <&usb2_id>;
+};
 
-       dwc3@7600000 {
-               extcon = <&usb2_id>;
-               dr_mode = "otg";
-               maximum-speed = "high-speed";
-       };
+&usb2_dwc3 {
+       extcon = <&usb2_id>;
+       dr_mode = "otg";
+       maximum-speed = "high-speed";
 };
 
 &usb3 {
        status = "okay";
        extcon = <&usb3_id>;
+};
 
-       dwc3@6a00000 {
-               extcon = <&usb3_id>;
-               dr_mode = "otg";
-       };
+&usb3_dwc3 {
+       extcon = <&usb3_id>;
+       dr_mode = "otg";
 };
 
 &usb3phy {

diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index aac56575e30d6b0cb762dc4c36b2e646713bd626..09575011de720a28bb903950b839ff356dae98d4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -643,7 +643,7 @@
                        status = "disabled";
                };
 
-               usb2: usb2@7000000 {
+               usb2: usb@70f8800 {
                        compatible = "qcom,ipq6018-dwc3", "qcom,dwc3";
                        reg = <0x0 0x070F8800 0x0 0x400>;
                        #address-cells = <2>;
@@ -720,7 +720,7 @@
                        status = "disabled";
                };
 
-               usb3: usb3@8A00000 {
+               usb3: usb@8af8800 {
                        compatible = "qcom,ipq6018-dwc3", "qcom,dwc3";
                        reg = <0x0 0x8AF8800 0x0 0x400>;
                        #address-cells = <2>;
@@ -746,7 +746,7 @@
                        resets = <&gcc GCC_USB0_BCR>;
                        status = "disabled";
 
-                       dwc_0: usb@8A00000 {
+                       dwc_0: usb@8a00000 {
                                compatible = "snps,dwc3";
                                reg = <0x0 0x8A00000 0x0 0xcd00>;
                                interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
index d80b1cefab100970ff476deb81c1fbda79df1532..69cf3a307ca8cdcbb99c04ec35bb87abceb8f81d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -578,7 +578,7 @@
                        resets = <&gcc GCC_USB0_BCR>;
                        status = "disabled";
 
-                       dwc_0: dwc3@8a00000 {
+                       dwc_0: usb@8a00000 {
                                compatible = "snps,dwc3";
                                reg = <0x8a00000 0xcd00>;
                                interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
@@ -618,7 +618,7 @@
                        resets = <&gcc GCC_USB1_BCR>;
                        status = "disabled";
 
-                       dwc_1: dwc3@8c00000 {
+                       dwc_1: usb@8c00000 {
                                compatible = "snps,dwc3";
                                reg = <0x8c00000 0xcd00>;
                                interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
index 7a9fcbe9bb31d407dfd2df7e14a73056add39011..51f88267e5adf6fa15004338cd61fcd4fca429ff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
@@ -296,19 +296,19 @@
        extcon = <&typec>;
 
        qcom,select-utmi-as-pipe-clk;
+};
 
-       dwc3@6a00000 {
-               extcon = <&typec>;
+&usb3_dwc3 {
+       extcon = <&typec>;
 
-               /* usb3-phy is not used on this device */
-               phys = <&hsusb_phy1>;
-               phy-names = "usb2-phy";
+       /* usb3-phy is not used on this device */
+       phys = <&hsusb_phy1>;
+       phy-names = "usb2-phy";
 
-               maximum-speed = "high-speed";
-               snps,is-utmi-l1-suspend;
-               snps,usb2-gadget-lpm-disable;
-               snps,hird-threshold = /bits/ 8 <0>;
-       };
+       maximum-speed = "high-speed";
+       snps,is-utmi-l1-suspend;
+       snps,usb2-gadget-lpm-disable;
+       snps,hird-threshold = /bits/ 8 <0>;
 };
 
 &hsusb_phy1 {

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index b9a48cfd760faf2382f6498777563762732a8c55..a16b23307cb0f4bba8b99d7b865d8ec930638626 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -2625,7 +2625,7 @@
                        power-domains = <&gcc USB30_GDSC>;
                        status = "disabled";
 
-                       usb3_dwc3: dwc3@6a00000 {
+                       usb3_dwc3: usb@6a00000 {
                                compatible = "snps,dwc3";
                                reg = <0x06a00000 0xcc00>;
                                interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
@@ -2953,7 +2953,7 @@
                        qcom,select-utmi-as-pipe-clk;
                        status = "disabled";
 
-                       dwc3@7600000 {
+                       usb2_dwc3: usb@7600000 {
                                compatible = "snps,dwc3";
                                reg = <0x07600000 0xcc00>;
                                interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
index 2fda21e810c966c8eb89eeac60972027a153bb8f..0f0217d33d448d31e09a7f87ce646fb68482d519 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
@@ -2025,7 +2025,7 @@
 
                        resets = <&gcc GCC_USB_30_BCR>;
 
-                       usb3_dwc3: dwc3@a800000 {
+                       usb3_dwc3: usb@a800000 {
                                compatible = "snps,dwc3";
                                reg = <0x0a800000 0xcd00>;
                                interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
index a80c578484ba3e8fbfe587031403f03d818a6d46..2f3104a84417c91a2f6170e6521f1004a38a4d79 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
@@ -337,9 +337,10 @@
 &usb3 {
        status = "okay";
 
-       dwc3@7580000 {
-               dr_mode = "host";
-       };
+};
+
+&usb3_dwc3 {
+       dr_mode = "host";
 };
 
 &usb2_phy_prim {

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index 3f06f7cd3cf2da94353043b9ab087ee0695498f1..22dabd392eaa38ed847c77c2de8d73bc8e1e5546 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -544,7 +544,7 @@
                        assigned-clock-rates = <19200000>, <200000000>;
                        status = "disabled";
 
-                       dwc3@7580000 {
+                       usb3_dwc3: usb@7580000 {
                                compatible = "snps,dwc3";
                                reg = <0x07580000 0xcd00>;
                                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
@@ -573,7 +573,7 @@
                        assigned-clock-rates = <19200000>, <133333333>;
                        status = "disabled";
 
-                       dwc3@78c0000 {
+                       usb@78c0000 {
                                compatible = "snps,dwc3";
                                reg = <0x078c0000 0xcc00>;
                                interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index e1c46b80f14a075681a1d2be9578ed6b634da11f..01e7e19f1edc323ca67523f2768148c1f5867f95 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -2786,7 +2786,7 @@
                                        <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
 
-                       usb_1_dwc3: dwc3@a600000 {
+                       usb_1_dwc3: usb@a600000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a600000 0 0xe000>;
                                interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index b31bf62e86809a6b66f1223f620ea96961a46faa..47cb4edfe9146cd7aaa6f9a192394ff7b2aa7cd1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -3868,7 +3868,7 @@
                                        <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
 
-                       usb_1_dwc3: dwc3@a600000 {
+                       usb_1_dwc3: usb@a600000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a600000 0 0xcd00>;
                                interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
@@ -3916,7 +3916,7 @@
                                        <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_1 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
 
-                       usb_2_dwc3: dwc3@a800000 {
+                       usb_2_dwc3: usb@a800000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a800000 0 0xcd00>;
                                interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 15f3bf2e7ea0c1fd5f6841a6bc45cc03afa86f26..a0f59061816bed88d8b8248be675925d4eec7f6e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -3317,7 +3317,7 @@
 
                        resets = <&gcc GCC_USB30_PRIM_BCR>;
 
-                       usb_1_dwc3: dwc3@a600000 {
+                       usb_1_dwc3: usb@a600000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a600000 0 0xcd00>;
                                interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;