ath79: fix pci_device_reg errors

Found by dtc. Wrong numbers and wrong ordering.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
index c8510a89441c4f5887270cb9fff6c75bb06acf46..dd110fc18591f05a4644bf127cfe63a7f3c4df6f 100644 (file)
--- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
@@ -94,7 +94,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 { /* 2.4 GHz */
+       ath9k0: wifi@11,0 { /* 2.4 GHz */
                compatible = "pci168c,0029";
                nvmem-cells = <&macaddr_hwinfo_1c 1>;
                nvmem-cell-names = "mac-address";
@@ -103,7 +103,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 { /* 5 GHz */
+       ath9k1: wifi@12,0 { /* 5 GHz */
                compatible = "pci168c,0029";
                nvmem-cells = <&macaddr_hwinfo_1c 2>;
                nvmem-cell-names = "mac-address";

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
index 96a76a3cfc603b6bbbee2da2f763b541c5cf98a1..62a2083d20c4bd957084d62c8d7583c896a679a6 100644 (file)
--- a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
@@ -120,7 +120,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 {
+       ath9k0: wifi@11,0 {
                compatible = "pci168c,0029";
                nvmem-cells = <&macaddr_hwinfo_1c 1>;
                nvmem-cell-names = "mac-address";
@@ -129,7 +129,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 {
+       ath9k1: wifi@12,0 {
                compatible = "pci168c,0029";
                nvmem-cells = <&macaddr_hwinfo_1c 2>;
                nvmem-cell-names = "mac-address";

diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index e3f48fee852ccee6a2fbbe5cc3eafd7dce72340a..50c0748a384151099c48e6cc3899a431fb239e52 100644 (file)
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -196,7 +196,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 {
+       ath9k0: wifi@11,0 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                qca,no-eeprom;
@@ -204,7 +204,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 {
+       ath9k1: wifi@12,0 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                qca,no-eeprom;

diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
index b62111c110e68a03bcd23cc20170c11021486e18..639736d9c45320d2922e745eab1bf2dc0f5a6641 100644 (file)
--- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
+++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
@@ -136,7 +136,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 {
+       ath9k0: wifi@11,0 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                nvmem-cells = <&macaddr_lan 0>, <&cal_art_1000>;
@@ -145,7 +145,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 {
+       ath9k1: wifi@12,0 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                nvmem-cells = <&macaddr_wan 1>, <&cal_art_5000>;

diff --git a/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts b/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts
index ddcf68970d32c4e866d1c6beee13b15065fb0a58..e0aa5704cddc3d6e799fc45fbd362460c062efe3 100644 (file)
--- a/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts
+++ b/target/linux/ath79/dts/ar7161_fortinet_fap-220-b.dts
@@ -95,7 +95,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 { /* 2.4 GHz */
+       ath9k0: wifi@11,0 { /* 2.4 GHz */
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                ieee80211-freq-limit = <2402000 2482000>;
@@ -105,7 +105,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 { /* 5 GHz */
+       ath9k1: wifi@12,0 { /* 5 GHz */
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                ieee80211-freq-limit = <2402000 2482000 4900000 5990000>;

diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
index 6b8574e880f92960e9acdc0cfd1041573c4de735..b732010446f220c214a769c6b21b4a9169a29a76 100644 (file)
--- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts
+++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
@@ -70,7 +70,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 { /* 2.4 GHz */
+       ath9k0: wifi@11,0 { /* 2.4 GHz */
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                qca,no-eeprom;
@@ -80,7 +80,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 { /* 5 GHz */
+       ath9k1: wifi@12,0 { /* 5 GHz */
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                qca,no-eeprom;

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
index 9761234714c87b19c0208deb4588d84ce077218b..020b45d9e1d7bcb89e41468b902dcb639eab59b5 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
+++ b/target/linux/ath79/dts/ar7161_netgear_wndap360.dts
@@ -147,7 +147,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 {
+       ath9k0: wifi@11,0 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                nvmem-cells = <&macaddr_art_120c>, <&calibration_art_1000>;
@@ -156,7 +156,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 {
+       ath9k1: wifi@12,0 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_520c 1>, <&calibration_art_5000>;

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index 296ecc8c4e08fc41013076a031668ffb6381bf7f..d30b4dad3080570af6e4a9eeed9fa9d683034fe4 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -126,7 +126,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 {
+       ath9k0: wifi@11,0 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
 
@@ -153,7 +153,7 @@
                };
        };
 
-       ath9k1: wifi@0,12 {
+       ath9k1: wifi@12,0 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
 

diff --git a/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi b/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi
index 065068571cd85c95e0a239edf27f2a67e8a42447..54a15c49c1bd3c6e5ce48762698e8406ad77db85 100644 (file)
--- a/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi
+++ b/target/linux/ath79/dts/ar7161_ruckus_gd11.dtsi
@@ -131,7 +131,7 @@
 &pcie0 {
        status = "okay";
 
-       ath9k0: wifi@0,11 { /* 2.4 GHz */
+       ath9k0: wifi@11,0 { /* 2.4 GHz */
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                nvmem-cells = <&macaddr_bdata_60>;
@@ -140,7 +140,7 @@
                gpio-controller;
        };
 
-       ath9k1: wifi@0,12 { /* 5 GHz */
+       ath9k1: wifi@12,0 { /* 5 GHz */
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                nvmem-cells = <&macaddr_bdata_76>;

diff --git a/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts b/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts
index a770ca04a87b75fe24bd03b63d5ccada8b97bbe9..7508be1df1d9ec501cf56d4a241d9af4ae8ed34e 100644 (file)
--- a/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts
+++ b/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts
@@ -92,13 +92,13 @@
 &pcie0 {
        status = "okay";
 
-       wifi@0,11 {
+       wifi@11,0 {
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                qca,no-eeprom;
        };
 
-       wifi@0,12 {
+       wifi@12,0 {
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                qca,no-eeprom;

diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
index 8e8deba933775dd15de2ce0ab59c7398dfe2e29d..861964fdfcdc7ae009165f2075e4893e927ea6cb 100644 (file)
--- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
@@ -75,7 +75,7 @@
 &pcie {
        status = "okay";
 
-       ath9k: wifi@0,0,0 {
+       ath9k: wifi@0,0 {
                compatible = "pci168c,002a";
                reg = <0x0 0 0 0 0>;
                nvmem-cells = <&macaddr_art_0 1>;

diff --git a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
index 69629335b3ca79565cebf651d9253d561854112c..a7def14c738a720a012cb6e74b3240b9de3ed38b 100644 (file)
--- a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
@@ -75,7 +75,7 @@
 &pcie {
        status = "okay";
 
-       ath9k: wifi@0,0,0 {
+       ath9k: wifi@0,0 {
                compatible = "pci168c,002a";
                reg = <0x0 0 0 0 0>;
                nvmem-cells = <&macaddr_art_0 (-1)>;

diff --git a/target/linux/ath79/dts/ar7242_meraki_mr12.dts b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
index adea2778eac82c77bf287faee004cabcff3f7005..5218a5ce27649b798931150be4062fd9378c1a80 100644 (file)
--- a/target/linux/ath79/dts/ar7242_meraki_mr12.dts
+++ b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
@@ -70,7 +70,7 @@
 &pcie {
        status = "okay";
 
-       wifi@0,0,0 {
+       wifi@0,0 {
                compatible = "pci168c,002a";
                reg = <0x0000 0 0 0 0>;
                qca,no-eeprom;

diff --git a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
index a45aa444de4b85bf4fd46c0f0f7ddc7dc84b85ae..c2c7cbb960c797aeed4a9b8c83064be391388777 100644 (file)
--- a/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
+++ b/target/linux/ath79/dts/ar9344_araknis_an-300-ap-i-n.dts
@@ -84,7 +84,7 @@
 &pcie {
        status = "okay";
 
-       ath9k: wifi@0,0,0 {
+       ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0 0 0 0 0>;
                nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_5000>;

diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
index 888e3f82ada1cc673db92326558e9904cf136796..4d3a149e3ee26f0ce2d0296819b9cc5ae771c625 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
@@ -34,7 +34,7 @@
 };
 
 &pcie {
-       wifi@0,0,0 {
+       wifi@0,0 {
                nvmem-cells = <&macaddr_art_0 0>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
        };

diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
index ac9bbea5d4d7343eaf8a863c7c29fe626c731325..e7b8b9c3ce239a83fd506475e48e8966a4b16903 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
@@ -29,7 +29,7 @@
 };
 
 &pcie {
-       wifi@0,0,0 {
+       wifi@0,0 {
                nvmem-cells = <&macaddr_art_0 (-2)>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
        };

diff --git a/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi b/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi
index c8f12a1bfbdf216a94b66d023ebec10addfe4ee3..6b1ae8ac93e1acd26e2432ddf55e5dc6835d3f75 100644 (file)
--- a/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi
+++ b/target/linux/ath79/dts/ar9344_fortinet_ap-dual.dtsi
@@ -56,7 +56,7 @@
 &pcie {
        status = "okay";
 
-       ath9k: wifi@0,0,0 {
+       ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0 0 0 0 0>;
        };

diff --git a/target/linux/ath79/dts/ar9344_netgear_r6100.dts b/target/linux/ath79/dts/ar9344_netgear_r6100.dts
index 419fa51f6175b6774051f98971e3e7ce72aa015b..5952e0140fa0c5b9b10dc3731d811c41787b4966 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_r6100.dts
+++ b/target/linux/ath79/dts/ar9344_netgear_r6100.dts
@@ -203,7 +203,7 @@
 &pcie {
        status = "okay";
 
-       wifi@0,0,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
 

diff --git a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi
index c0e95065d5ae6f75544609875c21a447a4179b24..f1d6ffda7c5cc9fcb9bf543e11807b5839578eb2 100644 (file)
--- a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi
+++ b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi
@@ -59,7 +59,7 @@
 &pcie {
        status = "okay";
 
-       ath9k: wifi@0,0,0 {
+       ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0 0 0 0 0>;
                ieee80211-freq-limit = <2402000 2482000>;

diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
index 2fd9a6e51bf72b43936aef02e4927d6194d266ce..e09d539c5644e4bd920c1b736aa9ef9b2bb0a76b 100644 (file)
--- a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
+++ b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
@@ -63,7 +63,7 @@
 &pcie {
        status = "disabled";
 
-       wifi@0,0,0 {
+       wifi@0,0 {
                nvmem-cells = <&calibration_art_5000>;
                nvmem-cell-names = "calibration";
        };

diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
index 9cf6819958feffa88022c82f4472f6b5035c5358..c3d7c50813ab9abcb6070bf82cad15e0f4e31be5 100644 (file)
--- a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
+++ b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
@@ -61,7 +61,7 @@
 };
 
 &pcie {
-       wifi@0,0,0 {
+       wifi@0,0 {
                nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
        };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index 1c6dcee8bf857829fd4cb0d46e20471580b6c85e..b81485f4653c11612b6deacc8f40b0f364d66e5f 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -72,7 +72,6 @@
        wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0 0 0 0 0>;
-               device_type = "pci";
        };
 };
 

diff --git a/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts b/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts
index 59dd83d5f87417a3952d1425a2015ba7c5dec818..4a68f530751d8f6ac343d70e1ee65858c058faf2 100644 (file)
--- a/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts
+++ b/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts
@@ -75,7 +75,7 @@
 &pcie0 {
        status = "okay";
 
-       wifi@0,0,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x0 0 0 0 0>;
        };

diff --git a/target/linux/ath79/dts/qca9558_engenius_esr900.dts b/target/linux/ath79/dts/qca9558_engenius_esr900.dts
index 269f743223c71fec8b61cd17cc1ed39e277b2fe8..ef0e21a3b59ff1c21b56521132e482128facf579 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_esr900.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_esr900.dts
@@ -76,7 +76,7 @@
 &pcie0 {
        status = "okay";
 
-       wifi@0,0,0 {
+       wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&calibration_art_5000>;

diff --git a/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi b/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi
index e448cd301222e5be63c1683a90598e74ddac943a..66f2e388534bb8f1852ccfb1b6cff524239d14bc 100644 (file)
--- a/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi
+++ b/target/linux/ath79/dts/qca955x_engenius_ecb1xxx.dtsi
@@ -119,7 +119,7 @@
 &pcie0 {
        status = "okay";
 
-       wifi@0,0,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x0 0 0 0 0>;
                qca,no-eeprom;

diff --git a/target/linux/ath79/dts/qca955x_senao_loader.dtsi b/target/linux/ath79/dts/qca955x_senao_loader.dtsi
index cf82c050b6d53760598d68ba7bfeeec2b0deac95..31e00ce063805e4f66ee8dff753c52f1a2c6deda 100644 (file)
--- a/target/linux/ath79/dts/qca955x_senao_loader.dtsi
+++ b/target/linux/ath79/dts/qca955x_senao_loader.dtsi
@@ -26,16 +26,16 @@
 };
 
 &pcie0 {
-       ath10k_0: wifi@0,0,0 {
+       ath10k_0: wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x0 0 0 0 0>;
        };
 };
 
 &pcie1 {
-       ath10k_1: wifi@0,1,0 {
+       ath10k_1: wifi@0,0 {
                compatible = "qcom,ath10k";
-               reg = <0x0 1 0 0 0>;
+               reg = <0x0 0 0 0 0>;
        };
 };
 

diff --git a/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
index 61446263c479837600ddd6e431d59e74d322d064..8f62cf442ce751ef9e285cc67aa8e58807997556 100644 (file)
--- a/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
+++ b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
@@ -43,7 +43,7 @@
 &pcie0 {
        status = "okay";
 
-       ath10k_0: wifi@0,0,0 {
+       ath10k_0: wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x0000 0 0 0 0>;
        };