From 67af946dd739f9077c266b6d208b96c6ae06f181 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 23 Oct 2025 20:21:30 -0700 Subject: [PATCH] lantiq: match wifi node names to reg node name matches various comments about the pci path. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/20522 Signed-off-by: Hauke Mehrtens --- .../files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts | 2 +- .../files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts | 2 +- .../files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts | 2 +- .../files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts | 2 +- .../arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts | 2 +- .../files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts | 2 +- .../arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi | 2 +- .../files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi | 2 +- .../files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts | 2 +- .../files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts | 2 +- .../files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts | 2 +- .../files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) 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 13158f0fab..87206d3314 100644 --- 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 f3cc8ccb22..6e94cdd718 100644 --- 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 c76357279e..f321e04241 100644 --- 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 9108db1bd6..295de79119 100644 --- 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 4b0cba2beb..4fc79b7be3 100644 --- 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 4c9c9e524d..fa8df363d3 100644 --- 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 dc4f6d3021..0465b2b463 100644 --- 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 87046f9e0b..0c2cbbf9db 100644 --- 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 5315f3723e..fba7487743 100644 --- 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 17b04846f9..4387a77fda 100644 --- 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 1d8e521370..b4effa65ef 100644 --- 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 768e13c627..6bcf74af3c 100644 --- 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 631e204c82..1811c7f587 100644 --- 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 5ef6a4cc9e..eb4e4305bc 100644 --- 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 536307f9bf..1d2b1819c6 100644 --- 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 e831af186d..d68ad0a868 100644 --- 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 6cf0082447..30adbc6e6f 100644 --- 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 58a34d6e27..e3bc666d41 100644 --- 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 a7fd3d3ec8..59dcac5681 100644 --- 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"; -- 2.30.2