[openwrt/openwrt] ipq40xx: 6.6: fix DTS to use reference for usb node
LEDE Commits
lede-commits at lists.infradead.org
Tue Apr 2 14:51:04 PDT 2024
ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/6136ebabc5cb8e37e2c6543e48ffeb7177320c5a
commit 6136ebabc5cb8e37e2c6543e48ffeb7177320c5a
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Wed Mar 20 11:16:14 2024 +0100
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 at gmail.com>
---
.../arch/arm/boot/dts/qcom/qcom-ipq4018-a42.dts | 8 +--
.../arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dtsi | 16 +++---
.../arch/arm/boot/dts/qcom/qcom-ipq4018-pa1200.dts | 8 +--
.../arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts | 8 +--
.../arm/boot/dts/qcom/qcom-ipq4019-e2600ac.dtsi | 66 +++++++++++-----------
.../boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts | 16 +++---
.../arm/boot/dts/qcom/qcom-ipq4019-hap-ac3.dts | 8 +--
.../arch/arm/boot/dts/qcom/qcom-ipq4028-wpj428.dts | 16 +++---
8 files changed, 73 insertions(+), 73 deletions(-)
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 f43c4b8000..8ce530dbd5 100644
--- 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 at 60f8800 {
- status = "okay";
- };
-
crypto at 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 bb293bb57e..581b939ae6 100644
--- 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 at 60f8800 {
- status = "okay";
- };
-
- usb3: usb3 at 8af8800 {
- status = "okay";
- };
-
crypto at 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 f23b58a3f4..cb847e7558 100644
--- 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 at 60f8800 {
- status = "okay";
- };
-
crypto at 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 39a52a7c48..463e1e171e 100644
--- 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 at 60f8800 {
- status = "okay";
- };
-
crypto at 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 d226611311..9216a7c9f8 100644
--- 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 at 60f8800 {
- status = "okay";
-
- dwc3 at 6000000 {
- #address-cells = <1>;
- #size-cells = <0>;
-
- usb2_port1: port at 1 {
- reg = <1>;
- #trigger-source-cells = <0>;
- };
- };
- };
-
serial at 78af000 {
pinctrl-0 = <&serial_0_pins>;
pinctrl-names = "default";
@@ -90,25 +76,6 @@
status = "okay";
};
- usb3: usb3 at 8af8800 {
- status = "okay";
-
- dwc3 at 8a00000 {
- #address-cells = <1>;
- #size-cells = <0>;
-
- usb3_port1: port at 1 {
- reg = <1>;
- #trigger-source-cells = <0>;
- };
-
- usb3_port2: port at 2 {
- reg = <2>;
- #trigger-source-cells = <0>;
- };
- };
- };
-
crypto at 8e3a000 {
status = "okay";
};
@@ -233,6 +200,25 @@
};
};
+&usb3 {
+ status = "okay";
+
+ dwc3 at 8a00000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ usb3_port1: port at 1 {
+ reg = <1>;
+ #trigger-source-cells = <0>;
+ };
+
+ usb3_port2: port at 2 {
+ reg = <2>;
+ #trigger-source-cells = <0>;
+ };
+ };
+};
+
&usb3_ss_phy {
status = "okay";
};
@@ -241,6 +227,20 @@
status = "okay";
};
+&usb2 {
+ status = "okay";
+
+ dwc3 at 6000000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ usb2_port1: port at 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 26e9941a9f..86daa58a3f 100644
--- 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 at 60f8800 {
- status = "okay";
- };
-
- usb3: usb3 at 8af8800 {
- status = "okay";
- };
-
crypto at 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 4e2b4574d3..836ad44210 100644
--- 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 at 60f8800 {
- status = "okay";
- };
-
crypto at 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 4b61bbb5ac..88bcbb3101 100644
--- 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 at 60f8800 {
- status = "okay";
- };
-
- usb3: usb3 at 8af8800 {
- status = "okay";
- };
-
crypto at 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";
};
More information about the lede-commits
mailing list