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@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17082
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
index ca0b4131acffdfd798ee00cf72c9af66a423e9e5..2d9e17bcf8ac46628a4e259fd43a8b0e3eff95f2 100644 (file)
--- 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@0 {
                                                reg = <0x0 0x6>;
                                        };
-
-                                       macaddr_art_1002: macaddr@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 9f4c95c3d46ef282462d56ff0ee65c3ec776bffc..8dfcd2ee3a107fcf922df189b3b9767ca0c08bbf 100644 (file)
--- 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@6 {
                                                reg = <0x6 0x6>;
                                        };
-
-                                       macaddr_art_1002: macaddr@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 a5d684cf99520fdd72e31ca88d05d3ad66830c9f..e2bfd5484242b7e426558db56dded0d757334955 100644 (file)
--- 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 c68b49d6c26d43dd28b1d5b6d76f995542e8ecfb..16ba785a235289eeca61615ffe0495045e7015ca 100644 (file)
--- 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@6 {
                                                reg = <0x6 0x6>;
                                        };
-
-                                       macaddr_art_1002: macaddr@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 13a2e28619c87e1f296da854334ce95a99857123..48f2eff86a2f3283416c7839effaa9edb89d5cf6 100644 (file)
--- 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 ab1f8902b10a0f4ddc14faf1393edc2dd63674bc..5f1ef04f0bb4287b6c5531b4295dbf2e87cdcdfa 100644 (file)
--- 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@0 {
                                                reg = <0x0 0x6>;
                                        };
-
-                                       macaddr_art_1002: macaddr@1002 {
-                                               reg = <0x1002 0x6>;
-                                       };
-
-                                       macaddr_art_5006: macaddr@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";
 };