[openwrt/openwrt] ath79: remove wmac mac address defaults

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/86f489c02f8250fc898a269e2e8ae9baa7ac4524

commit 86f489c02f8250fc898a269e2e8ae9baa7ac4524
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sun Jun 23 12:25:34 2024 -0700

    ath79: remove wmac mac address defaults
    
    1002 and 5006 are default addresses as part of the calibration data.
    Don't bother specifying them explicitly.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/17082
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi   |  8 ++------
 target/linux/ath79/dts/ar9344_alfa-network_n5q.dts       |  8 ++------
 target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts |  4 ++--
 target/linux/ath79/dts/qca9531_alcatel_hh40v.dts         |  8 ++------
 target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi    |  4 ++--
 target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi      | 16 ++++------------
 6 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
index ca0b4131ac..2d9e17bcf8 100644
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
@@ -116,10 +116,6 @@
 					macaddr_art_0: macaddr at 0 {
 						reg = <0x0 0x6>;
 					};
-
-					macaddr_art_1002: macaddr at 1002 {
-						reg = <0x1002 0x6>;
-					};
 				};
 			};
 
@@ -143,6 +139,6 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
-	nvmem-cell-names = "calibration", "mac-address";
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
index 9f4c95c3d4..8dfcd2ee3a 100644
--- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
+++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
@@ -154,10 +154,6 @@
 					macaddr_art_6: macaddr at 6 {
 						reg = <0x6 0x6>;
 					};
-
-					macaddr_art_1002: macaddr at 1002 {
-						reg = <0x1002 0x6>;
-					};
 				};
 			};
 
@@ -173,6 +169,6 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
-	nvmem-cell-names = "calibration", "mac-address";
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
diff --git a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
index a5d684cf99..e2bfd54842 100644
--- a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
+++ b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
@@ -122,8 +122,8 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_art_1002 0>, <&calibration_art_1000>;
-	nvmem-cell-names = "mac-address", "calibration";
+	nvmem-cells = <&calibration_art_1000>;
+	nvmem-cell-names = "calibration";
 };
 
 &pcie {
diff --git a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
index c68b49d6c2..16ba785a23 100644
--- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
+++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
@@ -140,10 +140,6 @@
 					macaddr_art_6: macaddr at 6 {
 						reg = <0x6 0x6>;
 					};
-
-					macaddr_art_1002: macaddr at 1002 {
-						reg = <0x1002 0x6>;
-					};
 				};
 			};
 		};
@@ -174,6 +170,6 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
-	nvmem-cell-names = "calibration", "mac-address";
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
index 13a2e28619..48f2eff86a 100644
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
@@ -124,6 +124,6 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>;
-	nvmem-cell-names = "calibration", "mac-address";
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
index ab1f8902b1..5f1ef04f0b 100644
--- a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi
@@ -111,14 +111,6 @@
 					macaddr_art_0: macaddr at 0 {
 						reg = <0x0 0x6>;
 					};
-
-					macaddr_art_1002: macaddr at 1002 {
-						reg = <0x1002 0x6>;
-					};
-
-					macaddr_art_5006: macaddr at 5006 {
-						reg = <0x5006 0x6>;
-					};
 				};
 			};
 
@@ -182,8 +174,8 @@
 		compatible = "qcom,ath10k";
 		reg = <0 0 0 0 0>;
 
-		nvmem-cells = <&macaddr_art_5006>, <&calibration_ath10k>;
-		nvmem-cell-names = "mac-address", "pre-calibration";
+		nvmem-cells = <&calibration_ath10k>;
+		nvmem-cell-names = "pre-calibration";
 	};
 };
 
@@ -206,6 +198,6 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_art_1002>, <&calibration_ath9k>;
-	nvmem-cell-names = "mac-address", "calibration";
+	nvmem-cells = <&calibration_ath9k>;
+	nvmem-cell-names = "calibration";
 };