From: Robert Marko Date: Sat, 29 Nov 2025 16:56:11 +0000 (+0100) Subject: Revert "treewide: fixup ath10k nodes" X-Git-Tag: v25.12.0-rc1~208 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39f201998592dc7202977fc8173f4d09c093bf42;p=thirdparty%2Fopenwrt.git Revert "treewide: fixup ath10k nodes" This reverts commit 741689a335de75430dc505bcdb9326bf1149f807. Only after merging I remebered the reason why it was changed to 0,0 [1]. [1] https://github.com/openwrt/openwrt/commit/1e20f7b6c61ded7a77ebee76b59612c76d76b9f2 Signed-off-by: Robert Marko --- 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 2b564485140..686b9c01d30 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 @@ -213,7 +213,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 c5accbdc2d7..e08dc49d6ae 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 @@ -94,7 +94,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 b178c9a0333..5b1a5b5bf31 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 @@ -204,7 +204,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 305cfacf41e..5c83d556da8 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 @@ -236,8 +236,8 @@ }; &pcie_bridge0 { - /* QCA9984 */ - wifi@1,0 { + wifi@0,0 { + /* QCA9984 */ 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 5b5420fbab1..4908a99a590 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 @@ -337,8 +337,8 @@ }; &pcie_bridge0 { - /* Bootlog shows this is a 168c:0056 - QCA 9888v2 */ - wifi@1,0 { + wifi@0,0 { + /* Bootlog shows this is a 168c:0056 - QCA 9888v2 */ 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 64d2c634584..f4c71fb8dc2 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 @@ -474,7 +474,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 8c7b6d56431..ad3509ddc54 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 @@ -231,7 +231,7 @@ &pcie_bridge0 { /* wil6210 802.11ad card */ - wifi@1,0 { + wifi@0,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 ef3d08e58e1..f64ffd85229 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 @@ -244,7 +244,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 bddbcd61dac..c2a3acd7f0f 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 @@ -473,7 +473,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 abd4c707269..d677ab62461 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 @@ -424,7 +424,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 f93211a1fb7..0d10a9c6d79 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 @@ -80,7 +80,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 fefcbd99676..ef88bb02a29 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 @@ -314,7 +314,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 666b12b1c56..c0a24001f3f 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 @@ -193,7 +193,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 1ce70251239..495cb533614 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 @@ -312,7 +312,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 c7dacfd7911..6187d125bf3 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 @@ -65,7 +65,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 5744693ddd7..7f5e6fd0b43 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 @@ -231,7 +231,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 70e954b749b..819220725bc 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 @@ -235,7 +235,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 a25b7377c27..46cc68435f6 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 @@ -304,7 +304,7 @@ }; &pcie_bridge0 { - wifi@1,0 { + wifi@0,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 42a439dd8ed..03f66ea4af6 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 fa45cab2f4c..764aaa6209b 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 d4d78674a63..98cba965809 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 f65a575d8fd..cdd10370676 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x10000 0 0 0 0>; nvmem-cells = <&precal_art_1000>; @@ -68,7 +68,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 c6bb93b38a7..98d55f8c978 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; nvmem-cells = <&macaddr_appsbl_7ff80 8>; @@ -357,7 +357,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 1cecb301b47..2e901d5a204 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; qcom,ath10k-calibration-variant = "ASRock-G10"; @@ -300,7 +300,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 6b79488d7f6..dd8d0b3cf17 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 75cfd672d35..56dbfcf089e 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x10000 0 0 0 0>; nvmem-cells = <&macaddr_eeprom_6 1>; @@ -301,7 +301,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 94cd9025ba5..3d03ff0c061 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 b6c5d7bc7ce..f1526819711 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 77a772610c5..f37a9c4308d 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 c96845df3cd..5534231917c 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; qcom,ath10k-calibration-variant = "Nokia-AC400i"; @@ -213,7 +213,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 b4ffdcc7927..4f1b49f63cc 100644 --- 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@1,0 { + wifi0: wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; }; @@ -556,7 +556,7 @@ }; &pcie_bridge1 { - wifi1: wifi@1,0 { + wifi1: wifi@0,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 9b4c1deb9e6..bf820d580df 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; nvmem-cells = <&precal_ART_1000>; @@ -598,7 +598,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 7fc209fd6bc..d9aee7ec8ad 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 54a24ccdf16..6b6e97d8050 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; }; @@ -272,7 +272,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 231d688c359..c38ded86ee4 100644 --- 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@1,0 { + wifi0: wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; }; @@ -86,7 +86,7 @@ }; &pcie_bridge1 { - wifi1: wifi@1,0 { + wifi1: wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; }; @@ -97,7 +97,7 @@ }; &pcie_bridge2 { - wifi2: wifi@1,0 { + wifi2: wifi@0,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 65559f06558..762574f07c7 100644 --- 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@1,0 { + wifi@0,0 { compatible = "qcom,ath10k"; reg = <0x00010000 0 0 0 0>; qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L"; @@ -246,7 +246,7 @@ }; &pcie_bridge1 { - wifi@1,0 { + wifi@0,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 e43705d36e6..e8400e5fe61 100644 --- 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@1,0 { + wifi@0,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@1,0 { + wifi@0,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 85b54a6acc2..bfe9589ecd0 100644 --- 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,9 +529,13 @@ perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* QCN9074: ath11k lacks DT compatible for PCI cards */ compatible = "pci17cb,1104"; reg = <0x00010000 0 0 0 0>; + qcom,ath11k-calibration-variant = "Xiaomi-AX6000"; }; }; @@ -551,9 +555,12 @@ perst-gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + 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 4108eecf732..77be190dc4c 100644 --- 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,9 +308,13 @@ perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* QCN9074: ath11k lacks DT compatible for PCI cards */ 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 99c4da4eb6d..2883a466f36 100644 --- 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,9 +155,13 @@ perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* QCN9074: ath11k lacks DT compatible for PCI cards */ 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 5c5aa2b8d9d..6ee86d60293 100644 --- 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,9 +166,13 @@ perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* QCN9074: ath11k lacks DT compatible for PCI cards */ 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 75688e98f66..014d788757e 100644 --- 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,9 +156,13 @@ perst-gpios = <&tlmm 60 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* ath11k has no DT compatible for PCI cards */ 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 447ef4d91e9..c2a8ab28d44 100644 --- 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,7 +523,9 @@ status = "okay"; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + /* ath11k has no DT compatible for PCI cards */ 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 d616b4a20d8..4df2adbb20f 100644 --- 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,7 +51,9 @@ perst-gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>; pcie@0 { - wifi@1,0 { + wifi0: wifi@0,0 { + status = "okay"; + 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 d539a3ac16b..54c13885976 100644 --- 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,9 +536,13 @@ perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* ath11k has no DT compatible for PCI cards */ compatible = "pci17cb,1104"; reg = <0x00010000 0 0 0 0>; + qcom,ath11k-calibration-variant = "Xiaomi-AX9000"; }; }; @@ -554,9 +558,12 @@ perst-gpios = <&tlmm 62 GPIO_ACTIVE_HIGH>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + 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 ccf45553354..0b390e9298f 100644 --- 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,7 +290,10 @@ perst-gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* ath11k has no DT compatible for PCI cards */ 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 f2049687a0c..5c8ab8b7573 100644 --- 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,7 +523,9 @@ perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi0: wifi@0,0 { + status = "okay"; + 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 8d605e266d1..749aec9d1ae 100644 --- 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,7 +517,10 @@ perst-gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; pcie@0 { - wifi@1,0 { + wifi@0,0 { + status = "okay"; + + /* ath11k has no DT compatible for PCI cards */ compatible = "pci17cb,1104"; reg = <0x00010000 0 0 0 0>;