ipq40xx: 6.6: fix DTS to use reference for usb node

Fix DTS to use reference for usb node instead of redefining
them since upstream usb node names changed from usb2/3 to usb.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-a42.dts
index f43c4b800008a476adec622227412d8526cc4faf..8ce530dbd51ea5acda7f3f7316322f13f4c3cf49 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-a42.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-a42.dts
@@ -44,10 +44,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -191,6 +187,10 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+};
+
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dtsi
index bb293bb57ea473f3faf5fe9c8c5b7b4ea448d212..581b939ae6fc8865e9343851a646794a437e1b8c 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dtsi
@@ -54,14 +54,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -266,6 +258,10 @@
        qcom,ath10k-calibration-variant = "8devices-Jalapeno";
 };
 
+&usb3 {
+       status = "okay";
+};
+
 &usb3_ss_phy {
        status = "okay";
 };
@@ -274,6 +270,10 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+};
+
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-pa1200.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-pa1200.dts
index f23b58a3f44d9d12e277c068718db4ac20e52f65..cb847e755866d2dfc5fd133cb6f0cc1fec22fc86 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-pa1200.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4018-pa1200.dts
@@ -44,10 +44,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -183,6 +179,10 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+};
+
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
index 39a52a7c489796002dd6cdc320a4015e1d6f0380..463e1e171e0cce7bb2f17bfc1806c30b77124296 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
@@ -44,10 +44,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -202,6 +198,10 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+};
+
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi
index d22661131130c14db3d1ec738bcdf7e8d986f608..9216a7c9f8beb083c458d99d844493f455497576 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi
@@ -57,20 +57,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-
-                       dwc3@6000000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb2_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
                serial@78af000 {
                        pinctrl-0 = <&serial_0_pins>;
                        pinctrl-names = "default";
@@ -90,25 +76,6 @@
                        status = "okay";
                };
 
-               usb3: usb3@8af8800 {
-                       status = "okay";
-
-                       dwc3@8a00000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               usb3_port1: port@1 {
-                                       reg = <1>;
-                                       #trigger-source-cells = <0>;
-                               };
-
-                               usb3_port2: port@2 {
-                                       reg = <2>;
-                                       #trigger-source-cells = <0>;
-                               };
-                       };
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -233,6 +200,25 @@
        };
 };
 
+&usb3 {
+       status = "okay";
+
+       dwc3@8a00000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               usb3_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
+
+               usb3_port2: port@2 {
+                       reg = <2>;
+                       #trigger-source-cells = <0>;
+               };
+       };
+};
+
 &usb3_ss_phy {
        status = "okay";
 };
@@ -241,6 +227,20 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+
+       dwc3@6000000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               usb2_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
+       };
+};
+
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts
index 26e9941a9fdc8dba3229b34167946605fb26dca6..86daa58a3f45a51d3e5fa26a61707971ea8182d7 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts
@@ -62,14 +62,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -379,6 +371,10 @@
        qcom,ath10k-calibration-variant = "8devices-Habanero";
 };
 
+&usb3 {
+       status = "okay";
+};
+
 &usb3_ss_phy {
        status = "okay";
 };
@@ -387,6 +383,10 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+};
+
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3.dts
index 4e2b4574d386d2f1403c8a41ca0862e3574b5cd7..836ad44210287f532a8d5e6973a473592334e6ab 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4019-hap-ac3.dts
@@ -63,10 +63,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -304,6 +300,10 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+};
+
 &usb2_hs_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4028-wpj428.dts
index 4b61bbb5aca676d84d0b102822ec4c1b3b1ef8a9..88bcbb310105ed8b2f0c1b9101af8653bce1bee4 100644 (file)
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4028-wpj428.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4028-wpj428.dts
@@ -73,14 +73,6 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2: usb2@60f8800 {
-                       status = "okay";
-               };
-
-               usb3: usb3@8af8800 {
-                       status = "okay";
-               };
-
                crypto@8e3a000 {
                        status = "okay";
                };
@@ -291,6 +283,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&usb3 {
+       status = "okay";
+};
+
 &usb3_ss_phy {
        status = "okay";
 };
@@ -299,6 +295,10 @@
        status = "okay";
 };
 
+&usb2 {
+       status = "okay";
+};
+
 &usb2_hs_phy {
        status = "okay";
 };