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@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18725
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

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 79242a42e43c50dee8853d3947fd7751be11ea2a..2a49dd40b508164aeef293c8a04a23a18ebea394 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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 1b9276ede2f8d6d8e6f563ad853bffe4b0419e23..c5accbdc2d7e0efa41b13b623d9d37cd2b2677fb 100644 (file)
--- 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@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 8bf86d40cd0138baf2a18ab4800d336d07e6a680..a237915695063e50b4473aa3441e3e61f3ae3df2 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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 8566c7c337eba1b9f54eae697b41b424823151fa..a7d89bd81f3545a334dca5432ffe631210caa3c8 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               dsl@1,0 {
-                       compatible = "intel,vrx518";
-                       status = "okay";
-                       reg = <0x00010000 0 0 0 0>;
-               };
+&pcie_bridge0 {
+       dsl@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 e60cd42778d496810958e9a399b092dcdae5008d..53476bb1e19c40cb5cdff469a15ff4b2d5a0cb44 100644 (file)
--- 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@0 {
                reg = <0x0>;
        };
+
+       ethernet-phy-package@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 f720be6d03bcf993b38ba5d8a88fcddf89305a82..c0dbb8b41e835c3861ffa9b46d9c709f29b1ed08 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@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@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 33400170c85427de6636dfb696822571dc4c583b..d1fe0e0012447975cf718aa2a0a1ff7a6aec58a4 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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 d792599f1a2ae104023f381bbff6c9ceb7f6ef1b..cf53ac6a52ed4a5148cdf421b7d1448d621c2e5e 100644 (file)
--- 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@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 50fdf1662d80cd58f88064bc7908fde416a193c0..c36fd81cdeb4328f341f533eac01b82d392cdfe7 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@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@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 b042329bc7b13550f493f846178c712bf795f27f..1f777b4092b9b1e3d52787a87f33967b7f64706f 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               /* wil6210 802.11ad card */
-               wifi: wifi@1,0 {
-                       status = "okay";
-                       /* wil6210 driver has no compatible */
-                       reg = <0x00010000 0 0 0 0>;
-               };
+&pcie_bridge0 {
+       /* wil6210 802.11ad card */
+       wifi@1,0 {
+               /* wil6210 driver has no compatible */
+               reg = <0x00010000 0 0 0 0>;
        };
 };
 
@@ -249,10 +243,10 @@
        ar8035: ethernet-phy@0 {
                reg = <0>;
        };
-};
 
-&qca807x {
-       status = "disabled";
+       ethernet-phy-package@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 e3a5ad7be5c095dd0df3bff7b27f22242cd57daa..329d85704b941184547b2e70a6e712fde59a923b 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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 3eaa75b520b747ad836f63f6016421edcdea03cf..913d0c6b955c299cdb7b7700be6f4d2c6f5a7038 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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 f03717be33093dad18165c404ced1c541abb2480..c3fe58e0662cd1f581eee82ccd9214a41a93f7bb 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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 ab9a05c7887d9b27fb3e6b03cbef15053976e036..f93211a1fb723661c27d44696b839035418b2540 100644 (file)
--- 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@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 e3024ed663d2547f4e63b8545a5b67cf3832dbee..8348c1ee6351a96ed41cf727d42b1b018f68cacf 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@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@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 f4c64d6b0615c652ee624eaf3cb0df8f5de9b4bf..f907814d9e4ad36adcc29d5e53ac71f915099996 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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 5ebbaa90ade00956340783257840bd1f8550194f..ae2b6b750b7088ecc8e132ce10bcaafd68327da9 100644 (file)
--- 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@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 48b2e43d18ee3a9c481ade2d89c4e45f5dead121..30f3f05624648bd28a2587c51ffef7c9d53ace36 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@1,0 {
-                       compatible = "qcom,ath10k";
-                       reg = <0x00010000 0 0 0 0>;
-
-                       qcom,ath10k-calibration-variant = "ASUS-RT-AC42U";
-               };
+&pcie_bridge0 {
+       wifi@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 70c3b561c02619bb524118e252f1633600c44930..ec746b14088590b0be957818275ded7dee4afb05 100644 (file)
--- 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@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 9da7e44547d270deed8fc058ff900277753e7319..14e6a5498a2dbe804c1a2eeedfb96b9c30625192 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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 3db61b1e3779665b096abdaa40287e055b78ae5e..5744693ddd7b2a3726b24102bb5a0f5c8842bfcc 100644 (file)
--- 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@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 c892bf0c5bef4c1d387f4fdfd15ffe3eb3556828..4de35683556f4b3203b2ca1bc1eaa9fa02249b32 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi@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@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 3bcc5c3cec269ff47e5e7d669e1fc02d4b029696..5b20aa07fbd2d41e3bd90100c0d8a1785bee0f6e 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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 520ccdfd1cc3aefb43c6fd05f00392153d8916be..72a8e8bd84de91537bf71ff2b3ad3ac3ffd6a718 100644 (file)
--- 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@5 {
                reg = <0x5>;
        };
+
+       ethernet-phy-package@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 9d2f7ce1bc205ac933c6767ff8ffb21f84805dfc..8167dba0c5cc435d0c358007f139a43ef6172c07 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-
-               wifi2: wifi@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@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@1 {
                reg = <1>;
        };
+
+       ethernet-phy-package@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 d432b2ec2d63a2ce0ceadd496675c35daf20f3de..b187a4f44a98f2ab25cf186bca9e3070c5e700d9 100644 (file)
--- 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@0,0 {
-               reg = <0x00000000 0 0 0 0>;
-               #address-cells = <3>;
-               #size-cells = <2>;
-               ranges;
-       };
 };
 
 &vqmmc {