treewide: fixup ath10k nodes

Use compatible before reg for consistency.

Also fixup the wifi node name for some qualcomm platforms where the slot
is 1 instead of 0.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20351
Signed-off-by: Robert Marko <[email protected]>

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 686b9c01d3046bd31a0e5154accd6d1bbf8fa392..2b564485140f9d3d54a3c1fdd18d0277c681407b 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
@@ -213,7 +213,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

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 e08dc49d6ae968828e0ea19cdd5f367ac6115e63..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
@@ -94,7 +94,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5490000 5835000>;

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 5b1a5b5bf3180b9fb32088750f6637a12b51b24a..b178c9a0333fe003d03f6d8a59f1e2c2c6651677 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
@@ -204,7 +204,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "pre-calibration";

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 5c83d556da8463bb9c71b8f572f3929727a742a8..305cfacf41ed5cec93e10a762c64c2ca9deecea3 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
@@ -236,8 +236,8 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
-               /* QCA9984 */
+       /* QCA9984 */
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5470000 5875000>;

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 4908a99a590b07e06be98a871b31f822fced574e..5b5420fbab1cf4b18e1dded1d13ec39bfac0e28f 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
@@ -337,8 +337,8 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
-               /* Bootlog shows this is a 168c:0056 - QCA 9888v2 */
+       /* Bootlog shows this is a 168c:0056 - QCA 9888v2 */
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5450000 5900000>;

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 f4c71fb8dc22711dcfb3557d411d29dc9cbff410..64d2c63458470ae312dad6b017390afd8df99d88 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
@@ -474,7 +474,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

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 ad3509ddc54bca572347db26919ca246c1ae21f8..8c7b6d564313e01f6ec6931404bdcf13c5d17fc4 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
@@ -231,7 +231,7 @@
 
 &pcie_bridge0 {
        /* wil6210 802.11ad card */
-       wifi@0,0 {
+       wifi@1,0 {
                /* wil6210 driver has no compatible */
                reg = <0x00010000 0 0 0 0>;
        };

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 f64ffd85229c9702a5ecabe979b5ae8e97fe3f00..ef3d08e58e1f29f69b335857612478a22ca42462 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
@@ -244,7 +244,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

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 c2a3acd7f0fd8dfc3ddd0d4088e8b6b6b8955912..bddbcd61dacc2ce162e93c3ead864657d6a3f079 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
@@ -473,7 +473,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "pre-calibration", "mac-address";

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 d677ab624618cbbc9cc0b5d9367afd95dda396a5..abd4c7072690b92acc2d28863adb83688ee65a65 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
@@ -424,7 +424,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "mac-address";

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 0d10a9c6d79adb2ce7fb4ea7b430de18024691a6..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
@@ -80,7 +80,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5490000 5835000>;

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 ef88bb02a29da4841917a13a7bc651cca07943d9..fefcbd996760e1bdbfd2acc59040469e898fcb87 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
@@ -314,7 +314,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5470000 5875000>;

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 c0a24001f3fda03fea8a586f9e877b22942f2550..666b12b1c564a87d02d6af03f2052fd5f3af4100 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
@@ -193,7 +193,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

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 495cb5336142564e5ab216be3b4bc6c49e0577e7..1ce70251239049ac7b9d2629f4cd47f9827834f8 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
@@ -312,7 +312,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       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 6187d125bf3cba65c4372f2b8438dd9e915e684d..c7dacfd7911da5bb7ec50e70e336f707d7ebf045 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
@@ -65,7 +65,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                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 7f5e6fd0b4379ff6fa356b8f2c0441fa3db7c564..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
@@ -231,7 +231,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5490000 5835000>;

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 819220725bc721cc1015873ef12a824a83cfe724..70e954b749be87272eb0f157a3736a145bec7f39 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
@@ -235,7 +235,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "pre-calibration", "mac-address";

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 46cc68435f63775a2f44414c9bd3ec95fbdda06a..a25b7377c27763f4d8d20e83a892793a132a3916 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
@@ -304,7 +304,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&mac_address 1>, <&cal_factory_9000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
index 03f66ea4af6d9f8df5e4f1ec14d8f924d3bcb7c8..42a439dd8edcdcd946b48b2b75d517d320c2d88b 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
@@ -401,7 +401,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
@@ -416,7 +416,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <2400000 2483000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
index 764aaa6209b11cd278d2ac316c0635199894f800..fa45cab2f4c59a4b75d8b63d1e43bfed362064b1 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
@@ -314,7 +314,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
@@ -328,7 +328,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_8 0>, <&precal_radio_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
index 98cba965809e4c172a2c7af60b02c5a143b80ac0..d4d78674a63cf266ada36a6a3176d7d2bff64c08 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
@@ -207,7 +207,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
@@ -224,7 +224,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
index cdd103706769a696cc7c76e2995c4f64c09bd06f..f65a575d8fd586fa71335e56069ef2d66dd7d02a 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
@@ -55,7 +55,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x10000 0 0 0 0>;
                nvmem-cells = <&precal_art_1000>;
@@ -68,7 +68,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x10000 0 0 0 0>;
                nvmem-cells = <&precal_art_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
index 98d55f8c978525de453897f5e5ce937bfa031ed7..c6bb93b38a7f6de16f0943f9c1d76779cff9cc2a 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
@@ -342,7 +342,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_appsbl_7ff80 8>;
@@ -357,7 +357,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_appsbl_7ff80 16>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
index 2e901d5a204c0d492729357933b448fd5d698c8f..1cecb301b4793fe4fdc0547b1f3da05e7ce1c684 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
@@ -288,7 +288,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "ASRock-G10";
@@ -300,7 +300,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "ASRock-G10";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
index dd8d0b3cf174f04dd2b7deb23e47101146846a36..6b79488d7f637d6a2086d78d13678fa78f9b8d6d 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
@@ -210,7 +210,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
@@ -227,7 +227,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
index 56dbfcf089ebc8294923e3ba708ab948cb31b8f6..75cfd672d3582df8737a46827eca7101a3b30bfc 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
@@ -288,7 +288,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x10000 0 0 0 0>;
                nvmem-cells = <&macaddr_eeprom_6 1>;
@@ -301,7 +301,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x10000 0 0 0 0>;
                nvmem-cells = <&macaddr_eeprom_6 2>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
index 3d03ff0c0614f36385a1cf90d0b69bbde82a5e5a..94cd9025ba53cdabbc218d50c08ddff486eb0587 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
@@ -342,7 +342,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_0 (-1)>, <&precal_ART_1000>;
@@ -356,7 +356,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_0 0>, <&precal_ART_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
index f152681971119737cee3e32b07045cf3fcf8b24e..b6c5d7bc7ce1ee400b8447df4e756817e2bb31d4 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
@@ -461,7 +461,7 @@ switch@10 {
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
@@ -475,7 +475,7 @@ switch@10 {
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_PRODUCTDATA_c>, <&precal_ART_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
index f37a9c4308dd2d0042bda1baf565a4246f3a7455..77a772610c5cf9d56a6e61ef1aa8e480d827afa7 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
@@ -522,7 +522,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_ART_1e>, <&precal_ART_1000>;
@@ -536,7 +536,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_ART_18>, <&precal_ART_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
index 5534231917ca2961cb92f3f74b3d2d43ef8f038c..c96845df3cd14402222b4c6336991f127db8b69c 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
@@ -197,7 +197,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Nokia-AC400i";
@@ -213,7 +213,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Nokia-AC400i";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
index 4f1b49f63cc6befb68fbe8571c226ea84de6ea84..b4ffdcc79277e692e79d90b08e53841c3ce9f33e 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
@@ -543,7 +543,7 @@
 };
 
 &pcie_bridge0 {
-       wifi0: wifi@0,0 {
+       wifi0: wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
@@ -556,7 +556,7 @@
 };
 
 &pcie_bridge1 {
-       wifi1: wifi@0,0 {
+       wifi1: wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
index bf820d580df6f51bff6b8f01f41acc108db94696..9b4c1deb9e6eb1303b4d9a2eca49c001730d213e 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
@@ -581,7 +581,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_1000>;
@@ -598,7 +598,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_5000>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
index d9aee7ec8adef03f34b9bcc349df7ca944c1ef08..7fc209fd6bc7f68941241a6e87d8f9906207fdb3 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
@@ -479,7 +479,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_1000>, <&macaddr_fw_env_12>;
@@ -496,7 +496,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_5000>, <&macaddr_fw_env_c>;

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
index 6b6e97d8050f00656f58d7842773bf592cb82c31..54a24ccdf16f23aed4fbb8a341d8d85dd23a6777 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
@@ -258,7 +258,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
@@ -272,7 +272,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
index c38ded86ee48a5e9400eb9c73d099ad7f246fc3e..231d688c3599300c6027f7be83d34a1b0c00a7f9 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
@@ -75,7 +75,7 @@
 };
 
 &pcie_bridge0 {
-       wifi0: wifi@0,0 {
+       wifi0: wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
@@ -86,7 +86,7 @@
 };
 
 &pcie_bridge1 {
-       wifi1: wifi@0,0 {
+       wifi1: wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
@@ -97,7 +97,7 @@
 };
 
 &pcie_bridge2 {
-       wifi2: wifi@0,0 {
+       wifi2: wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
index 762574f07c74a41621a0f25f596bc982c86e50d7..65559f0655897f12d854bb05163c12952da30a16 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
@@ -230,7 +230,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";
@@ -246,7 +246,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
index e8400e5fe61dd5d7630cf8b9eb73f6469fe17983..e43705d36e67506ffdd188426133da6efd688c86 100644 (file)
--- a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
+++ b/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
@@ -201,7 +201,7 @@
 };
 
 &pcie_bridge1 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";
@@ -215,7 +215,7 @@
 };
 
 &pcie_bridge2 {
-       wifi@0,0 {
+       wifi@1,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts
index bfe9589ecd0c5f20c4876bede6b59eecb7f10e6c..85b54a6acc254afcc5068edd4a5f464690fb4431 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-ax6000.dts
@@ -529,13 +529,9 @@
        perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* QCN9074: ath11k lacks DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath11k-calibration-variant = "Xiaomi-AX6000";
                };
        };
@@ -555,12 +551,9 @@
        perst-gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
+               wifi@1,0 {
                        compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath10k-calibration-variant = "Xiaomi-AX6000";
                        nvmem-cell-names = "calibration";
                        nvmem-cells = <&caldata_qca9889>;

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
index 77be190dc4c42490f52c8a35195f716870ef0411..4108eecf732e148e1294d49926fc2b24fa45f0ee 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
@@ -308,13 +308,9 @@
        perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* QCN9074: ath11k lacks DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath11k-calibration-variant = "Linksys-MR5500";
                };
        };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
index 2883a466f366be305b0f8013af76ef60338c8005..99c4da4eb6d2e298645bcdf9dce9864d59b85032 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
@@ -155,13 +155,9 @@
        perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* QCN9074: ath11k lacks DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath11k-calibration-variant = "Linksys-MX5500";
                };
        };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
index 6ee86d60293d16f05e33941faaae1847f59f4c48..5c5aa2b8d9deac3908189fe39ebb36b26fb87fba 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
@@ -166,13 +166,9 @@
        perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* QCN9074: ath11k lacks DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath11k-calibration-variant = "Linksys-SPNMX56";
                };
        };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts
index 014d788757eddfc34f2d56dd057695b7766768ac..75688e98f6641a0fb528fbe5d061628cc8b4ec33 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts
@@ -156,13 +156,9 @@
        perst-gpios = <&tlmm 60 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* ath11k has no DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath11k-fw-memory-mode = <0>;
                        qcom,ath11k-calibration-variant = "CambiumNetworks-XE34";
                };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts
index c2a8ab28d4404879242e418d1568edbcd4767dd2..447ef4d91e98375a1f7c01ddde79b1c3c378baf7 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts
@@ -523,9 +523,7 @@
        status = "okay";
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-                       /* ath11k has no DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
                        qcom,ath11k-calibration-variant = "Linksys-MR7500";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts
index 4df2adbb20f9f4a8de853a911f9358d4482b5de7..d616b4a20d8413e899699abf288ec89cdb248c97 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts
@@ -51,9 +51,7 @@
        perst-gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>;
 
        pcie@0 {
-               wifi0: wifi@0,0 {
-                       status = "okay";
-
+               wifi@1,0 {
                        compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
index 54c13885976ff69ad14a5258bf0c41c6f9ebbe56..d539a3ac16bbebef81ccf352abf2452b42c4eed3 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
@@ -536,13 +536,9 @@
        perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* ath11k has no DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath11k-calibration-variant = "Xiaomi-AX9000";
                };
        };
@@ -558,12 +554,9 @@
        perst-gpios = <&tlmm 62 GPIO_ACTIVE_HIGH>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
+               wifi@1,0 {
                        compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
-
                        qcom,ath10k-calibration-variant = "Xiaomi-AX9000";
                        nvmem-cell-names = "calibration";
                        nvmem-cells = <&caldata_qca9889>;

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
index 0b390e9298fee78d145caeb2ffda9030bcfc6356..ccf4555335434efc01da8d9d4afd5d2ed100749d 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
@@ -290,10 +290,7 @@
        perst-gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* ath11k has no DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
index 5c8ab8b7573f43fddaf5a06a8a19de300d189d9e..f2049687a0c1fa7ffb1ad4485303ea338b0f92a4 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
@@ -523,9 +523,7 @@
        perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi0: wifi@0,0 {
-                       status = "okay";
-
+               wifi@1,0 {
                        compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
index 749aec9d1ae993d675a21a32add2fef4b37830c8..8d605e266d10469f64cb3e429911ac8bda4606eb 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
@@ -517,10 +517,7 @@
        perst-gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@0,0 {
-                       status = "okay";
-
-                       /* ath11k has no DT compatible for PCI cards */
+               wifi@1,0 {
                        compatible = "pci17cb,1104";
                        reg = <0x00010000 0 0 0 0>;