[openwrt/openwrt] ath79: revert wmac node names

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 9 08:17:25 PDT 2025


nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/118d8ee98132f4519cc208cbbaae6d1f8cb7d295

commit 118d8ee98132f4519cc208cbbaae6d1f8cb7d295
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed Jul 9 17:16:27 2025 +0200

    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 at nbd.name>
---
 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 38e7798883..ee9eab4ed1 100644
--- a/target/linux/ath79/dts/ar9132.dtsi
+++ b/target/linux/ath79/dts/ar9132.dtsi
@@ -175,7 +175,7 @@
 			#size-cells = <0>;
 		};
 
-		wmac: wifi at 180c0000 {
+		wmac: wmac at 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 09e1d29396..71c59a1a38 100644
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -152,7 +152,7 @@
 			reg = <0x18070000 0x4>;
 		};
 
-		wmac: wifi at 18100000 {
+		wmac: wmac at 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 586eecff7f..7f26c35bbe 100644
--- a/target/linux/ath79/dts/ar934x.dtsi
+++ b/target/linux/ath79/dts/ar934x.dtsi
@@ -153,7 +153,7 @@
 			reg = <0x18070000 0x14>;
 		};
 
-		wmac: wifi at 18100000 {
+		wmac: wmac at 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 f3a9d59fb8..b5b51275cb 100644
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -177,7 +177,7 @@
 			status = "disabled";
 		};
 
-		wmac: wifi at 18100000 {
+		wmac: wmac at 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 002a5c518a..76847c15b2 100644
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.dtsi
@@ -229,7 +229,7 @@
 			status = "disabled";
 		};
 
-		wmac: wifi at 18100000 {
+		wmac: wmac at 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 ab7c55ab1a..433cbafc1a 100644
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -147,7 +147,7 @@
 			reg = <0x18070000 0x64>;
 		};
 
-		wmac: wifi at 18100000 {
+		wmac: wmac at 18100000 {
 			compatible = "qca,qca9560-wifi";
 			reg = <0x18100000 0x10000>;
 




More information about the lede-commits mailing list