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 <nbd@nbd.name>

diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi
index 38e7798883952caa5ddd64fa99a865ac25e59ba3..ee9eab4ed1ff8863155a768511a6245020261049 100644 (file)
--- 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 09e1d29396472f9c2a9ba8be4c509802d7235b70..71c59a1a38d083b2d56f0f71aff9d3680a40cdb6 100644 (file)
--- 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 586eecff7fe2092b8f8b776123660ba380a92d10..7f26c35bbef6844d043c73e39508af6625b495dc 100644 (file)
--- 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 f3a9d59fb8e7136f3fe32eee0e521b02db8bf134..b5b51275cbecee87d4f1cc4f211072a1f1386ddb 100644 (file)
--- 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 002a5c518a322301c3dba37e19b610c461d39963..76847c15b205b4d5eb028739faa23398fb9b0147 100644 (file)
--- 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 ab7c55ab1a52e24275c67162780d1f6a9525f369..433cbafc1ae45b4edc35b2c0e1a3ae9b6647b4aa 100644 (file)
--- 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>;