From 118d8ee98132f4519cc208cbbaae6d1f8cb7d295 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 9 Jul 2025 17:16:27 +0200 Subject: [PATCH] ath79: revert wmac node names Changing the node names arbitrarily broke existing configurations, which rely on the device path in /etc/config/wireless. Revert that part of the change without altering the compatible strings. Fixes: 7e09959efda2 ("mac80211: fix wmac node names") Signed-off-by: Felix Fietkau --- target/linux/ath79/dts/ar9132.dtsi | 2 +- target/linux/ath79/dts/ar9330.dtsi | 2 +- target/linux/ath79/dts/ar934x.dtsi | 2 +- target/linux/ath79/dts/qca953x.dtsi | 2 +- target/linux/ath79/dts/qca955x.dtsi | 2 +- target/linux/ath79/dts/qca956x.dtsi | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi index 38e77988839..ee9eab4ed1f 100644 --- a/target/linux/ath79/dts/ar9132.dtsi +++ b/target/linux/ath79/dts/ar9132.dtsi @@ -175,7 +175,7 @@ #size-cells = <0>; }; - wmac: wifi@180c0000 { + wmac: wmac@180c0000 { compatible = "qca,ar9130-wifi"; reg = <0x180c0000 0x230000>; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index 09e1d293964..71c59a1a38d 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -152,7 +152,7 @@ reg = <0x18070000 0x4>; }; - wmac: wifi@18100000 { + wmac: wmac@18100000 { compatible = "qca,ar9330-wifi"; reg = <0x18100000 0x20000>; diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index 586eecff7fe..7f26c35bbef 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -153,7 +153,7 @@ reg = <0x18070000 0x14>; }; - wmac: wifi@18100000 { + wmac: wmac@18100000 { compatible = "qca,ar9340-wifi"; reg = <0x18100000 0x20000>; diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi index f3a9d59fb8e..b5b51275cbe 100644 --- a/target/linux/ath79/dts/qca953x.dtsi +++ b/target/linux/ath79/dts/qca953x.dtsi @@ -177,7 +177,7 @@ status = "disabled"; }; - wmac: wifi@18100000 { + wmac: wmac@18100000 { compatible = "qca,qca9530-wifi"; reg = <0x18100000 0x20000>; diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi index 002a5c518a3..76847c15b20 100644 --- a/target/linux/ath79/dts/qca955x.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -229,7 +229,7 @@ status = "disabled"; }; - wmac: wifi@18100000 { + wmac: wmac@18100000 { compatible = "qca,qca9550-wifi"; reg = <0x18100000 0x10000>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index ab7c55ab1a5..433cbafc1ae 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -147,7 +147,7 @@ reg = <0x18070000 0x64>; }; - wmac: wifi@18100000 { + wmac: wmac@18100000 { compatible = "qca,qca9560-wifi"; reg = <0x18100000 0x10000>;