[openwrt/openwrt] ipq40xx: dts: compatibility changes for 6.12 kernel

LEDE Commits lede-commits at lists.infradead.org
Sun Jul 20 06:38:49 PDT 2025


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/08e2fdc17de68087bb30467f1430d4b6eaa9191b

commit 08e2fdc17de68087bb30467f1430d4b6eaa9191b
Author: Shiji Yang <yangshiji66 at outlook.com>
AuthorDate: Sat May 31 14:56:55 2025 +0800

    ipq40xx: dts: compatibility changes for 6.12 kernel
    
    - Remove duplicate PCIe bridge. A default bridge node has been
      added upstream.
    - Do not refer to the qca807x node. This node label has been
      removed. We can disable the qca807x phy in mdio node.
    
    Signed-off-by: Shiji Yang <yangshiji66 at outlook.com>
    Link: https://github.com/openwrt/openwrt/pull/18725
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts    | 25 +++++++------------
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts | 11 +++++----
 .../arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts     | 23 +++++++-----------
 .../boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts   | 16 ++++---------
 .../dts/qcom/qcom-ipq4019-fritzrepeater-1200.dts   |  8 +++----
 .../dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts   | 22 +++++++----------
 .../arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts    | 26 ++++++++------------
 .../boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts    |  8 -------
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts  | 24 +++++++------------
 .../arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts   | 24 +++++++------------
 .../arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts  | 20 ++++++----------
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts  | 23 +++++++-----------
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts | 21 +++++++---------
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts | 11 +++++----
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi  | 20 ++++++----------
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts | 25 +++++++------------
 .../arm/boot/dts/qcom/qcom-ipq4019-r619ac.dtsi     |  8 -------
 .../arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts    | 18 +++++---------
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts  | 11 +++++----
 .../arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi | 17 -------------
 .../arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts     | 16 +++++++------
 .../arm/boot/dts/qcom/qcom-ipq4019-wtr-m2133hp.dts | 21 +++++++---------
 .../arm/boot/dts/qcom/qcom-ipq4019-xx8300.dtsi     | 12 ----------
 .../dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi  |  8 +++----
 .../boot/dts/qcom/qcom-ipq4029-insect-common.dtsi  | 28 +++++++++-------------
 .../arch/arm/boot/dts/qcom/qcom-ipq40x9-dr40x9.dts |  8 -------
 26 files changed, 161 insertions(+), 293 deletions(-)

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
index 79242a42e4..2a49dd40b5 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
@@ -212,23 +212,16 @@
 	status = "okay";
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-			qcom,ath10k-calibration-variant = "OM-A62";
-			ieee80211-freq-limit = <5170000 5350000>;
-
-			nvmem-cell-names = "pre-calibration";
-			nvmem-cells = <&precal_art_9000>;
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5170000 5350000>;
+		nvmem-cell-names = "pre-calibration";
+		nvmem-cells = <&precal_art_9000>;
+		qcom,ath10k-calibration-variant = "OM-A62";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts
index 1b9276ede2..c5accbdc2d 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts
@@ -93,8 +93,11 @@
 	qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
 };
 
-&wifi2 {
-	status = "okay";
-	ieee80211-freq-limit = <5490000 5835000>;
-	qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5490000 5835000>;
+		qcom,ath10k-calibration-variant = "linksys-ea8300-fcc";
+	};
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts
index 8bf86d40cd..a237915695 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts
@@ -203,21 +203,16 @@
 	status = "okay";
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			reg = <0x00010000 0 0 0 0>;
-			nvmem-cell-names = "pre-calibration";
-			nvmem-cells = <&precal_art_9000>;
-			ieee80211-freq-limit = <5470000 5875000>;
-			qcom,ath10k-calibration-variant = "EnGenius-EAP2200";
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		nvmem-cell-names = "pre-calibration";
+		nvmem-cells = <&precal_art_9000>;
+		ieee80211-freq-limit = <5470000 5875000>;
+		qcom,ath10k-calibration-variant = "EnGenius-EAP2200";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts
index 8566c7c337..a7d89bd81f 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts
@@ -312,17 +312,11 @@
 
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		dsl at 1,0 {
-			compatible = "intel,vrx518";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-		};
+&pcie_bridge0 {
+	dsl at 1,0 {
+		compatible = "intel,vrx518";
+		reg = <0x00010000 0 0 0 0>;
 	};
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-1200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-1200.dts
index e60cd42778..53476bb1e1 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-1200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-1200.dts
@@ -255,6 +255,10 @@
 	ethphy: ethernet-phy at 0 {
 		reg = <0x0>;
 	};
+
+	ethernet-phy-package at 0 {
+		status = "disabled";
+	};
 };
 
 &gmac {
@@ -275,10 +279,6 @@
 	phy-mode = "rgmii-id";
 };
 
-&qca807x {
-	status = "disabled";
-};
-
 &ethphy1 {
 	status = "disabled";
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts
index f720be6d03..c0dbb8b41e 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts
@@ -233,21 +233,15 @@
 
 	perst-gpio = <&tlmm 35 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi at 1,0 {
-			/* QCA9984 */
-			compatible = "qcom,ath10k";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-			ieee80211-freq-limit = <5470000 5875000>;
-			/* Uses the reference BDF */
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		/* QCA9984 */
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5470000 5875000>;
+		/* Uses the reference BDF */
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts
index 33400170c8..d1fe0e0012 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts
@@ -334,23 +334,17 @@
 	status = "okay";
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			status = "okay";
-			/* Bootlog shows this is a 168c:0056 - QCA 9888v2 */
-			compatible = "qcom,ath10k";
-			reg = <0x00010000 0 0 0 0>;
-			nvmem-cell-names = "pre-calibration";
-			nvmem-cells = <&precal_art_9000>;
-			qcom,ath10k-calibration-variant = "GL-B2200";
-			ieee80211-freq-limit = <5450000 5900000>;
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		/* Bootlog shows this is a 168c:0056 - QCA 9888v2 */
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5450000 5900000>;
+		nvmem-cell-names = "pre-calibration";
+		nvmem-cells = <&precal_art_9000>;
+		qcom,ath10k-calibration-variant = "GL-B2200";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts
index d792599f1a..cf53ac6a52 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-habanero-dvk.dts
@@ -321,14 +321,6 @@
 
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-	/* Free slot for use */
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-	};
 };
 
 &mdio {
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts
index 50fdf1662d..c36fd81cde 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts
@@ -482,22 +482,16 @@
 	status = "okay";
 	perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-			ieee80211-freq-limit = <5170000 5350000>;
-			nvmem-cell-names = "pre-calibration", "mac-address";
-			nvmem-cells = <&precal_art_9000>, <&mac_address_wlan_2nd5g 0>;
-			qcom,ath10k-calibration-variant = "Netgear-LBR20";
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5170000 5350000>;
+		nvmem-cell-names = "pre-calibration", "mac-address";
+		nvmem-cells = <&precal_art_9000>, <&mac_address_wlan_2nd5g 0>;
+		qcom,ath10k-calibration-variant = "Netgear-LBR20";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
index b042329bc7..1f777b4092 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
@@ -227,19 +227,13 @@
 &pcie0 {
 	status = "okay";
 	perst-gpio = <&tlmm 42 GPIO_ACTIVE_HIGH>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		/* wil6210 802.11ad card */
-		wifi: wifi at 1,0 {
-			status = "okay";
-			/* wil6210 driver has no compatible */
-			reg = <0x00010000 0 0 0 0>;
-		};
+&pcie_bridge0 {
+	/* wil6210 802.11ad card */
+	wifi at 1,0 {
+		/* wil6210 driver has no compatible */
+		reg = <0x00010000 0 0 0 0>;
 	};
 };
 
@@ -249,10 +243,10 @@
 	ar8035: ethernet-phy at 0 {
 		reg = <0>;
 	};
-};
 
-&qca807x {
-	status = "disabled";
+	ethernet-phy-package at 0 {
+		status = "disabled";
+	};
 };
 
 &ethphy0 {
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts
index e3a5ad7be5..329d85704b 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts
@@ -205,20 +205,14 @@
 	status = "okay";
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-			qcom,ath10k-calibration-variant = "ASUS-MAP-AC2200";
-			ieee80211-freq-limit = <5170000 5350000>;
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5170000 5350000>;
+		qcom,ath10k-calibration-variant = "ASUS-MAP-AC2200";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts
index 3eaa75b520..913d0c6b95 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts
@@ -472,21 +472,14 @@
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 40 GPIO_ACTIVE_LOW>;
 	clkreq-gpio = <&tlmm 39 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "pci168c,0040";
-			nvmem-cell-names = "pre-calibration", "mac-address";
-			nvmem-cells = <&precal_art_9000>, <&macaddr_config_0 3>;
-			qcom,ath10k-calibration-variant = "ZTE-MF18A";
-			reg = <0x00010000 0 0 0 0>;
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "pci168c,0040";
+		reg = <0x00010000 0 0 0 0>;
+		nvmem-cell-names = "pre-calibration", "mac-address";
+		nvmem-cells = <&precal_art_9000>, <&macaddr_config_0 3>;
+		qcom,ath10k-calibration-variant = "ZTE-MF18A";
 	};
 };
-
-
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
index f03717be33..c3fe58e066 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
@@ -423,19 +423,14 @@
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 40 GPIO_ACTIVE_LOW>;
 	clkreq-gpio = <&tlmm 39 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			nvmem-cell-names = "mac-address";
-			nvmem-cells = <&macaddr_mac_0 4>;
-			compatible = "qcom,ath10k";
-			reg = <0x00010000 0 0 0 0>;
-			qcom,ath10k-calibration-variant = "zte,mf289f";
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&macaddr_mac_0 4>;
+		qcom,ath10k-calibration-variant = "zte,mf289f";
 	};
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts
index ab9a05c788..f93211a1fb 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts
@@ -79,8 +79,11 @@
 	qcom,ath10k-calibration-variant = "linksys-mr8300-v0-fcc";
 };
 
-&wifi2 {
-	status = "okay";
-	ieee80211-freq-limit = <5490000 5835000>;
-	qcom,ath10k-calibration-variant = "linksys-mr8300-v0-fcc";
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5490000 5835000>;
+		qcom,ath10k-calibration-variant = "linksys-mr8300-v0-fcc";
+	};
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
index e3024ed663..8348c1ee63 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
@@ -311,20 +311,14 @@
 
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-			ieee80211-freq-limit = <5470000 5875000>;
-			qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5470000 5875000>;
+		qcom,ath10k-calibration-variant = "Netgear-Orbi-Pro-SRK60";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts
index f4c64d6b06..f907814d9e 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts
@@ -192,23 +192,16 @@
 	status = "okay";
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-			qcom,ath10k-calibration-variant = "PlasmaCloud-PA2200";
-			ieee80211-freq-limit = <5170000 5350000>;
-
-			nvmem-cell-names = "pre-calibration";
-			nvmem-cells = <&precal_art_9000>;
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5170000 5350000>;
+		nvmem-cell-names = "pre-calibration";
+		nvmem-cells = <&precal_art_9000>;
+		qcom,ath10k-calibration-variant = "PlasmaCloud-PA2200";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-r619ac.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-r619ac.dtsi
index 5ebbaa90ad..ae2b6b750b 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-r619ac.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-r619ac.dtsi
@@ -210,14 +210,6 @@
 	pinctrl-0 = <&pcie_pins>;
 	perst-gpio = <&tlmm 4 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 40 GPIO_ACTIVE_HIGH>;
-
-	/* Free slot for use */
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-	};
 };
 
 &qpic_bam {
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts
index 48b2e43d18..30f3f05624 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts
@@ -309,18 +309,12 @@
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
 	clkreq-gpio = <&tlmm 39 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			reg = <0x00010000 0 0 0 0>;
-
-			qcom,ath10k-calibration-variant = "ASUS-RT-AC42U";
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		qcom,ath10k-calibration-variant = "ASUS-RT-AC42U";
 	};
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts
index 70c3b561c0..ec746b1408 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dts
@@ -64,8 +64,11 @@
 	qcom,ath10k-calibration-variant = "linksys-whw03";
 };
 
-&wifi2 {
-	reg = <0x00000000 0 0 0 0>;
-
-	qcom,ath10k-calibration-variant = "linksys-whw03";
+&pcie_bridge0 {
+	wifi at 0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00000000 0 0 0 0>;
+		ieee80211-freq-limit = <5490000 5835000>;
+		qcom,ath10k-calibration-variant = "linksys-whw03";
+	};
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
index 9da7e44547..14e6a5498a 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03.dtsi
@@ -238,17 +238,6 @@
 	perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
 	clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>;
-
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-		};
-	};
 };
 
 &gmac {
@@ -283,9 +272,3 @@
 
 	ieee80211-freq-limit = <5170000 5330000>;
 };
-
-&wifi2 {
-	status = "okay";
-
-	ieee80211-freq-limit = <5490000 5835000>;
-};
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
index 3db61b1e37..5744693ddd 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
@@ -230,11 +230,13 @@
 	nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0 2>;
 };
 
-&wifi2 {
-	reg = <0x00010000 0 0 0 0>;
-
-	qcom,ath10k-calibration-variant = "linksys-whw03v2";
-
-	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0 3>;
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		ieee80211-freq-limit = <5490000 5835000>;
+		nvmem-cell-names = "pre-calibration", "mac-address";
+		nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0 3>;
+		qcom,ath10k-calibration-variant = "linksys-whw03v2";
+	};
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wtr-m2133hp.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wtr-m2133hp.dts
index c892bf0c5b..4de3568355 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wtr-m2133hp.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wtr-m2133hp.dts
@@ -232,20 +232,15 @@
 
 &pcie0 {
 	status = "okay";
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi at 0,0 {
-			compatible = "qcom,ath10k";
-			reg = <0 0 0 0 0>;
-			nvmem-cell-names = "pre-calibration", "mac-address";
-			nvmem-cells = <&precal_art_9000>, <&macaddr_orgdata_32>;
-			qcom,ath10k-calibration-variant = "Buffalo-WTR-M2133HP";
-		};
+&pcie_bridge0 {
+	wifi at 0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0 0 0 0 0>;
+		nvmem-cell-names = "pre-calibration", "mac-address";
+		nvmem-cells = <&precal_art_9000>, <&macaddr_orgdata_32>;
+		qcom,ath10k-calibration-variant = "Buffalo-WTR-M2133HP";
 	};
 };
 
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-xx8300.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-xx8300.dtsi
index 3bcc5c3cec..5b20aa07fb 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-xx8300.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-xx8300.dtsi
@@ -207,18 +207,6 @@
 
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
-
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			reg = <0x00010000 0 0 0 0>;
-		};
-	};
 };
 
 &qpic_bam {
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi
index 520ccdfd1c..72a8e8bd84 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-aruba-glenmorangie.dtsi
@@ -217,6 +217,10 @@
 	ethphy: ethernet-phy at 5 {
 		reg = <0x5>;
 	};
+
+	ethernet-phy-package at 0 {
+		status = "disabled";
+	};
 };
 
 &gmac {
@@ -237,10 +241,6 @@
 	phy-mode = "rgmii-id";
 };
 
-&qca807x {
-	status = "disabled";
-};
-
 &ethphy0 {
 	status = "disabled";
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
index 9d2f7ce1bc..8167dba0c5 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
@@ -276,20 +276,14 @@
 	status = "okay";
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 50 GPIO_ACTIVE_LOW>;
+};
 
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-
-		wifi2: wifi at 1,0 {
-			compatible = "qcom,ath10k";
-			status = "okay";
-			reg = <0x00010000 0 0 0 0>;
-			nvmem-cells = <&mac_address 1>;
-			nvmem-cell-names = "mac-address";
-		};
+&pcie_bridge0 {
+	wifi at 1,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x00010000 0 0 0 0>;
+		nvmem-cells = <&mac_address 1>;
+		nvmem-cell-names = "mac-address";
 	};
 };
 
@@ -411,6 +405,10 @@
 	ar8035: ethernet-phy at 1 {
 		reg = <1>;
 	};
+
+	ethernet-phy-package at 0 {
+		status = "disabled";
+	};
 };
 
 &gmac {
@@ -433,10 +431,6 @@
 	phy-mode = "rgmii-rxid";
 };
 
-&qca807x {
-	status = "disabled";
-};
-
 &ethphy0 {
 	status = "disabled";
 };
diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq40x9-dr40x9.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq40x9-dr40x9.dts
index d432b2ec2d..b187a4f44a 100644
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq40x9-dr40x9.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq40x9-dr40x9.dts
@@ -333,14 +333,6 @@
 
 	perst-gpio = <&tlmm 38 GPIO_ACTIVE_LOW>;
 	wake-gpio = <&tlmm 40 GPIO_ACTIVE_LOW>;
-
-	/* Unpolulated slot */
-	bridge at 0,0 {
-		reg = <0x00000000 0 0 0 0>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		ranges;
-	};
 };
 
 &vqmmc {




More information about the lede-commits mailing list