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 <[email protected]>

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>;

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>;

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";

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>;

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>;

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>;

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>;
 	};

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>;

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";

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";

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>;

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>;

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>;

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";

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>;

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>;

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";

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>;

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>;

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>;

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>;

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>;

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>;

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";

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>;

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>;

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>;

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>;

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>;

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";

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>;
 	};

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>;

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>;

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>;
 	};

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>;
 	};

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";

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";

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>;

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";
 		};
 	};

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";
 		};
 	};

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";
 		};
 	};

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";
 		};

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";

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>;
 

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>;

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>;
 

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>;
 

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>;