ath79: fix label-mac-device for wmac

It appears 683-of_net-add-mac-address-to-of-tree.patch relies on the
mac-address nvmem property being present. wmac itself doesn't need it as
it takes it from the eeprom but label-mac-device needs it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21035
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 940393034145be876f9d7063c2f74c151c321002..3f64b26184075f93a90b27e13836e95c8274b9d2 100644 (file)
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
@@ -109,6 +109,10 @@
                                        macaddr_art_0: macaddr@0 {
                                                reg = <0x0 0x6>;
                                        };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 
@@ -132,8 +136,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
+       nvmem-cell-names = "calibration", "mac-address";
 
        led {
                led-sources = <0>;

diff --git a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
index d423edccf2795794714e0a8cc595bebd642ff509..e5c4cc01fbb50e1d8aeadb156df9074d0e18a3f1 100644 (file)
--- a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
+++ b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
@@ -116,6 +116,10 @@
                                        cal_art_1000: calibration@1000 {
                                                reg = <0x1000 0x440>;
                                        };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
                };
@@ -135,6 +139,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
+       nvmem-cell-names = "calibration", "mac-address";
 };

diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
index 385eb95638ad1545ec729fed11afa68eecb7b2b2..028c543e3cc82d64aa8144bbf9e513cbe9ed8819 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
@@ -79,6 +79,10 @@
                                        calibration_art_1000: calibration@1000 {
                                                reg = <0x1000 0x440>;
                                        };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
                };
@@ -88,8 +92,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&calibration_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&calibration_art_1000>, <&macaddr_art_1002>;
+       nvmem-cell-names = "calibration", "mac-address";
 };
 
 &eth0 {

diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
index 31d18d80ed3fce19d410532cd8fd62d6be2419c2..30cb50d5be1a851148be88533b938b03a59fa738 100644 (file)
--- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
+++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
@@ -146,6 +146,10 @@
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 
@@ -165,8 +169,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
+       nvmem-cell-names = "calibration", "mac-address";
 
        led {
                led-sources = <12>;

diff --git a/target/linux/ath79/dts/ar9344_longdata_aps256.dts b/target/linux/ath79/dts/ar9344_longdata_aps256.dts
index 5c0ba9bde02882ba25518a585e45f34c2b500148..a8ee61a003903c94faefd60d9e8e9951cf2d1d9e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_longdata_aps256.dts
+++ b/target/linux/ath79/dts/ar9344_longdata_aps256.dts
@@ -129,8 +129,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>;
+       nvmem-cell-names = "calibration", "mac-address";
 
        led {
                led-sources = <13>;

diff --git a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
index f34c9e744e4b818ad848a06fc42c6f1b50f8c275..91b1872f4f60381e8a9a18a7b29d6ebe9fb85357 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
@@ -87,6 +87,10 @@
                                        cal_art_1000: calibration@1000 {
                                                reg = <0x1000 0x440>;
                                        };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
 
@@ -127,6 +131,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
+       nvmem-cell-names = "calibration", "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
index 1d64c7085971bab95cff3945d398ccd0226bc4d5..69d7362fd192e2db08168b8b7a2113a600c0942d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
+++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
@@ -132,6 +132,10 @@
                                        macaddr_art_6: macaddr@6 {
                                                reg = <0x6 0x6>;
                                        };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
                };
@@ -162,8 +166,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
+       nvmem-cell-names = "calibration", "mac-address";
 
        led {
                led-sources = <0>;

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
index f5145b521cbf7d13d09d1ea17815fb5be22c135f..f5ee8975c7ad4d7f8f9c05ccdf59e01f83cd460d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
@@ -127,6 +127,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>;
+       nvmem-cell-names = "calibration", "mac-address";
 };

diff --git a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
index b6e6fc91dfef00d83fc3f6a7e6686b7cb59b874d..72654633dbf3da74b9a64c7d54c9a7d9e40d230d 100644 (file)
--- a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
+++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts
@@ -83,6 +83,10 @@
                                        cal_art_1000: calibration@1000 {
                                                reg = <0x1000 0x440>;
                                        };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
                                };
                        };
                };
@@ -110,6 +114,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&cal_art_1000>;
-       nvmem-cell-names = "calibration";
+       nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
+       nvmem-cell-names = "calibration", "mac-address";
 };