lantiq: match wifi node names to reg

node name matches various comments about the pci path.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20522
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index 13158f0fab8151d71e5832370eb88a93915909f7..87206d331406d6e7944788bad930615d97e9b2fb 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
@@ -188,7 +188,7 @@
        req-mask = <0xf>;
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@0,0 {
+       wifi@e,0 {
                compatible = "pci168c,002d";
                reg = <0x7000 0 0 0 0>;
                nvmem-cells = <&cal_ath9k_cal_985>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index f3cc8ccb221a8cb1fc1cfed6b82f912d57b2585c..6e94cdd718c4dd95f91b3c74e7b67679be42ab04 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -214,7 +214,7 @@
        req-mask = <0xf>;
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@0,0 {
+       wifi@e,0 {
                compatible = "pci168c,002d";
                reg = <0x7000 0 0 0 0>;
                nvmem-cells = <&cal_ath9k_cal_985>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index c76357279ef4cc47705585e8b6d62b4f95e2d63e..f321e0424169b8d5784b1c1eaaad7a05258c081e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -179,7 +179,7 @@
 
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@7000 {
+       wifi@e,0 {
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index 9108db1bd6f8bccc1fc4c4b47812f2c026a2b3f5..295de791195253b1a74c4a6698129f00ea583f5b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
@@ -135,7 +135,7 @@
 
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@168c,0029 {
+       wifi@e,0 {
                compatible = "pci168c,0029";
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 4b0cba2bebb1175ca67de59a2f67f094594fa389..4fc79b7be3dcadc06c2d08b3901ebee811cff594 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -171,7 +171,7 @@
        lantiq,external-clock;
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@1814,3592 {
+       wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
index 4c9c9e524d5ea22d262be1b489f3da2defb32908..fa8df363d318365588fee388e0e7b1a2d849f5b0 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
@@ -184,7 +184,7 @@
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
        req-mask = <0x3>;
 
-       wifi@1814,3592 {
+       wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index dc4f6d302185d2343ad32fc28ff02975b03a7b49..0465b2b463e5ca159126b5e529d1a50e022f2611 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -229,7 +229,7 @@
        lantiq,external-clock;
        req-mask = <0xf>;
 
-       wifi@168c,0029 {
+       wifi@e,0 {
                compatible = "pci168c,0029";
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 87046f9e0be1407c0449413c1aa799ef75fa0904..0c2cbbf9dbaf69818a733cd49bc22cccef06215b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
@@ -210,7 +210,7 @@
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
        req-mask = <0xf>;
 
-       wifi@0,0 {
+       wifi@e,0 {
                compatible = "pci0,0";
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index 5315f3723ed048dbbf11dcbd7e7dad8991c9a6e9..fba74877433addded02f604898dc79c7d97b84f0 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
@@ -153,7 +153,7 @@
 
        interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
 
-       wifi@0,0 {
+       wifi@e,0 {
                compatible = "pci0,0";
                reg = <0x7000 0 0 0 0>;
                nvmem-cells = <&eeprom_boardconfig_410>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 17b04846f93891a7d6c3a29cc3294bb7fe5e8311..4387a77fda0ab13d12ec9fba571e915e84127021 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -231,7 +231,7 @@
        interrupt-map = <0x7000 0 0 1 &icu0 135>;
        req-mask = <0x3>;
 
-       wifi0: wifi@1814,0601 {
+       wifi0: wifi@e,0 {
                compatible = "pci1814,0601";
                reg = <0x7000 0 0 0 0>;
                nvmem-cells = <&macaddr_boardconfig_16>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index 1d8e521370110dd23925e53aca3430c93aa4b466..b4effa65efbdfc74516665d398194df502b8923f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -251,7 +251,7 @@
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
        req-mask = <0x3>;
 
-       wifi@1814,3592 {
+       wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
index 768e13c627362f8201e942c7b6ae9c533cfe8908..6bcf74af3ccec04391e514fb40635191ba298e75 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
@@ -172,7 +172,7 @@
 
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@168c,0029 {
+       wifi@e,0 {
                compatible = "pci168c,0029";
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index 631e204c822c6fd4999955bfefacd60d5fb91cc1..1811c7f5874026ea2836f25ad1dd96695bcf5a88 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
@@ -221,7 +221,7 @@
 
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@168c,0027 {
+       wifi@e,0 {
                compatible = "pci168c,0027";
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index 5ef6a4cc9eeeaab677cc50b4bb9b9a7e4065d2c3..eb4e4305bc7d3bea25fd9ceb583282d5853d49c3 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -235,7 +235,7 @@
        status = "okay";
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@1814,3592 {
+       wifi@e,0 {
                compatible = "pci1814,3592";
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index 536307f9bf236b40d61005ce9a6361bf43c1e8b7..1d2b1819c6e28ef4ab8c75acd2476f131d7707eb 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -255,7 +255,7 @@
        status = "okay";
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@1814,3091 {
+       wifi@e,0 {
                compatible = "pci1814,3091";
                reg = <0x7000 0 0 0 0>;
                ralink,mtd-eeprom = <&boardconfig 0x410>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
index e831af186defc53e9683eec77bf488084550a4c1..d68ad0a868a023787e0232b58c183687189389d1 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
@@ -161,7 +161,7 @@
                #address-cells = <3>;
                device_type = "pci";
 
-               wifi@168c,002e {
+               wifi@0,0 {
                        compatible = "pci168c,002e";
                        reg = <0 0 0 0 0>;
                        qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:01:00.0.bin */

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index 6cf00824475a898faee2cfdb03f05468da396324..30adbc6e6f3fe9835c86c55ae2c01f8fa1c42a49 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -307,7 +307,7 @@
        status = "okay";
        reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
 
-       wifi@0,0 {
+       wifi@e,0 {
                compatible = "pci168c,002d";
                reg = <0x7000 0 0 0 0>;
                nvmem-cells = <&cal_caldata_1000>, <&macaddr_caldata_110c 2>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
index 58a34d6e27c7e278e63393c92d7dfb120ef95f3f..e3bc666d415ecf35c9854ea151012f794f8b29f6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
@@ -58,7 +58,7 @@
 };
 
 &pci0 {
-       wifi@1814,3062 {
+       wifi@e,0 {
                compatible = "pci1814,3062";
                reg = <0x7000 0 0 0 0>;
                ralink,eeprom = "RT3062.eeprom";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
index a7fd3d3ec8f46207cba7527a35e58824106c4fe3..59dcac56813278edc6802855957e1170f4b4aef6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts
@@ -6,7 +6,7 @@
 };
 
 &pci0 {
-       wifi@1814,3092 {
+       wifi@e,0 {
                compatible = "pci1814,3092";
                reg = <0x7000 0 0 0 0>;
                ralink,eeprom = "RT3092.eeprom";