treewide: fix compatible string for ath10k

The ath9k documentation says to use pci168c strings for the compatible
string, probably because the OWL loader uses it to overide bogus pci IDs
like abcd. This is not the case with ath10k and the documentation
explicitly states to use qcom,ath10k.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18920
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 0daabc69a7f5fa3cb00aa1231119494e62aabe62..114b053c883bcc048fed76f1b88342b4bc984d18 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -196,7 +196,7 @@
        status = "okay";
 
        wifi@0,0 {
-               compatible = "pci168c,003c";
+               compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&cal_art_5000>, <&macaddr_romfile_f100 2>;
                nvmem-cell-names = "calibration", "mac-address";

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index ff1cff9384bb4bcc03a58b43a5b447dae4819451..5acd59595b07ea0f8340c6578435272efb355920 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -197,7 +197,7 @@
        status = "okay";
 
        wifi@0,0 {
-               compatible = "pci168c,0050";
+               compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&cal_art_5000>, <&macaddr_info_8 (-1)>;
                nvmem-cell-names = "calibration", "mac-address";

diff --git a/target/linux/ath79/dts/qca9557_ruckus_r500.dts b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
index 53495ac16da9e05559b7fc69388d4e552bf0da62..d4200bd3ab1a6810e0d96335a62096c0cfce994f 100644 (file)
--- a/target/linux/ath79/dts/qca9557_ruckus_r500.dts
+++ b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
@@ -265,7 +265,7 @@
        status = "okay";
 
        ath10k: wifi@0,0 {
-               compatible = "pci168c,003c";
+               compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
                gpio-controller;
                #gpio-cells = <2>;

diff --git a/target/linux/ath79/dts/qca9558_nec_aterm.dtsi b/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
index d650927195eeadca58c21308801f76aa88960322..b80d53ebfddd3487fe968564bb0f0f7017d4334d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
+++ b/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
@@ -328,7 +328,7 @@
        status = "okay";
 
        wifi: wifi@0,0 {
-               compatible = "pci168c,003c";
+               compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&cal_art_5000>, <&macaddr_config_12>;
                nvmem-cell-names = "calibration", "mac-address";

diff --git a/target/linux/ath79/dts/qca9558_nec_wg2200hp.dts b/target/linux/ath79/dts/qca9558_nec_wg2200hp.dts
index 91ffe6d84c53ded998e814983e37132b70722e75..6a7065ea6b9e7566f8fbbbac37679ac71f6232cd 100644 (file)
--- a/target/linux/ath79/dts/qca9558_nec_wg2200hp.dts
+++ b/target/linux/ath79/dts/qca9558_nec_wg2200hp.dts
@@ -51,7 +51,6 @@
 };
 
 &wifi {
-       compatible = "pci168c,0046";
        nvmem-cells = <&precal_art_5000>, <&macaddr_config_12>;
        nvmem-cell-names = "pre-calibration", "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9563_kuwfi_n650.dts b/target/linux/ath79/dts/qca9563_kuwfi_n650.dts
index 03801dabb3ed6c7efaa541b9abe180ae61b416fe..53950b347e7c2f17a0fd1e237135eacf186027f2 100644 (file)
--- a/target/linux/ath79/dts/qca9563_kuwfi_n650.dts
+++ b/target/linux/ath79/dts/qca9563_kuwfi_n650.dts
@@ -170,7 +170,7 @@
        status = "okay";
 
        wifi@0,0 {
-               compatible = "pci168c,0056";
+               compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&precal_art_5000>, <&macaddr_art_0 1>;
                nvmem-cell-names = "pre-calibration", "mac-address";

diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
index c9e47938d3c4fbf0d9d812108330cf95e178bb8f..39090d7175095409e200b7d2b26f91e901fde74e 100644 (file)
--- a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
+++ b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
@@ -172,7 +172,7 @@
        status = "okay";
 
        wifi@0,0 {
-               compatible = "pci168c,0056";
+               compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&precal_art_5000>;
                nvmem-cell-names = "pre-calibration";

diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
index 82a22ca5dcbb0d85e73b9ed7804542575790dd34..1e986e0b1592218bccddad4a9e6daea05ace280d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@@ -55,7 +55,7 @@
        status = "okay";
 
        wifi@0,0 {
-               compatible = "pci168c,0056";
+               compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&precal_art_5000>;
                nvmem-cell-names = "pre-calibration";

diff --git a/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts b/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
index 76137c73c4e87d9e155cc1cf447825f9f679cf45..b6748637056bb1298dc1c5f8ae73bc9afbe87092 100644 (file)
--- a/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
+++ b/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
@@ -121,7 +121,7 @@
        status = "okay";
 
        wifi@0,0 {
-               compatible = "pci168c,0046";
+               compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
 
                nvmem-cells = <&macaddr_info_8 (-1)>, <&precal_art_5000>;

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 23577bde45f26a2b1f7fe9bab6e77cbe28c9877a..3e49fd5eddecc3b5ee3a41b63aa0a78a7096a3d9 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
@@ -476,7 +476,7 @@
 
 &pcie_bridge0 {
        wifi@0,0 {
-               compatible = "pci168c,0040";
+               compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "pre-calibration", "mac-address";
                nvmem-cells = <&precal_art_9000>, <&macaddr_config_0 3>;

diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
index f306201754efb26e5df052757df175d4146beb04..d8e018367ebe874c97419dbcf26c1c228765df5e 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
@@ -316,7 +316,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
@@ -336,7 +336,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       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.6/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
index 8077c3a0901242c0177c922af57d80ed22c8a919..24a7d2ca156a8be1d9465b38e926317c74a65b2f 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
@@ -212,7 +212,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
@@ -235,7 +235,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       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.6/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
index ad8078cd74437293ba1c22858df8a8cb1d965858..813eb050b45d95e4e4e44999f7164c5046333035 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
@@ -329,7 +329,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_appsbl_7ff80 8>;
@@ -350,7 +350,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_appsbl_7ff80 16>;

diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
index 6c52d51ebc17e92e24d6c3a9e978e0ea49fd432c..469cdaa0a2f88c5030d5241c6121a8f02a4b3dab 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
@@ -215,7 +215,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
@@ -238,7 +238,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       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.6/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
index 62530efeb1f2b00630b1bb4edb973f2c2230b738..3df650eba4d6dc078fadf8a9b3ded5a3dde19fb4 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
@@ -344,7 +344,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_defaultmac_0 (-1)>, <&precal_ART_1000>;
@@ -364,7 +364,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       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.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
index 0afc9219c9cf242405590743461263856f6bf57b..b97b4325f21e795ce4afd9dc979005d7b82265fc 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
@@ -466,7 +466,7 @@ switch@10 {
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
@@ -486,7 +486,7 @@ switch@10 {
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       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.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
index 58074258306f3f13b253b3eaecc8fe81a0c1553f..b3561cafe7613da27c80def8413c130a58fc3a5f 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
@@ -527,7 +527,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&macaddr_ART_1e>, <&precal_ART_1000>;
@@ -547,7 +547,7 @@
                ranges;
 
                wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       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.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
index a7f0b1dbf03423b0e72b256f33d47e5fa6e441fb..a2d916faaf46544d9012b07fdf560f2088ee8ffa 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
@@ -516,7 +516,7 @@
                ranges;
 
                wifi0: wifi@1,0 {
-                       compatible = "pci168c,0046";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
                };
        };
@@ -534,7 +534,7 @@
                ranges;
 
                wifi1: wifi@1,0 {
-                       compatible = "pci168c,0046";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
                };
        };

diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
index f10fa367f1eb31b7b2eb83f0a393c705a44e89c8..cd63f92db65121ccb7ff8fe5543cce5ce6805cc6 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
@@ -569,7 +569,7 @@
                ranges;
 
                wifi0: wifi@1,0 {
-                       compatible = "pci168c,0046";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&precal_ART_1000>;
@@ -592,7 +592,7 @@
                ranges;
 
                wifi1: wifi@1,0 {
-                       compatible = "pci168c,0046";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&precal_ART_5000>;

diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
index 5d86d80047f4cd68eefb81c94906670903a8820b..176ae2933762ce10b0a1e7ed6e668b6ef3787d75 100644 (file)
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
@@ -457,7 +457,7 @@
                ranges;
 
                wifi0: wifi@1,0 {
-                       compatible = "pci168c,0046";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&precal_ART_1000>, <&macaddr_fw_env_12>;
@@ -480,7 +480,7 @@
                ranges;
 
                wifi1: wifi@1,0 {
-                       compatible = "pci168c,0040";
+                       compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
 
                        nvmem-cells = <&precal_ART_5000>, <&macaddr_fw_env_c>;