ath79: move label-mac-device out of dtsi

A script was ran that checks the label-mac-device node to see if it has
nvmem definitions as label-mac-device requires nvmem.

This is mostly a change to make the script happy. No indended functional
difference.

Add a change to qca9533_yuncore_cpe830.dts adding an nvmem definition to
wmac. Seems to have been some kind of oversight where it's specified in
nvmem but not used. label-mac-device needs an NVMEM definition.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22907
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
index e3c8f2a6099a17312f664917132cd85143e049af..354a25ac0a72284cb3d8eb04a96293bcef57f4ae 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
@@ -11,6 +11,7 @@
                led-failsafe = &led_white;
                led-running = &led_blue;
                led-upgrade = &led_blue;
+               label-mac-device = &eth0;
        };
 
        leds {

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi
index e9abd423f57d1bb16bea44c2af8a5a3f85c242d5..f414d6465f51ef9ac6c6437facb0a4a5b4bbd164 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi
@@ -8,6 +8,7 @@
                led-failsafe = &led_dome_green;
                led-running = &led_dome_green;
                led-upgrade = &led_dome_green;
+               label-mac-device = &eth0;
        };
 
        leds {

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
index fa6c2337333bab7058b607c0425d1999a2b335b0..08f19418d53cf4ca1168ba083983dce256cc0e02 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
@@ -6,10 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       aliases {
-               label-mac-device = &eth0;
-       };
-
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
index 0cbddc529d97b9e4aa2956f9d6dab9721bb958d8..410f41d054322465dbf9b84eef07e7b25c98713e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
@@ -8,6 +8,10 @@
        model = "EnGenius EAP600";
        compatible = "engenius,eap600", "qca,ar9344";
 
+       aliases {
+               label-mac-device = &eth0;
+       };
+
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
index acfcafaa652100784b12ac7e376318e16fcc2832..d35b58394d90c07e97e839be67ce69ef107a041a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
@@ -8,6 +8,10 @@
        model = "EnGenius ECB600";
        compatible = "engenius,ecb600", "qca,ar9344";
 
+       aliases {
+               label-mac-device = &eth0;
+       };
+
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi
index b64a552635c0bb3ca053db5ab6d02bec3ef74d1f..d057a0ad5d89e347f9022197ebd3ef1b3776afd0 100644 (file)
--- a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi
+++ b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi
@@ -8,7 +8,6 @@
 
 / {
        aliases {
-               label-mac-device = &eth0;
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;

diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
index 09626b93c1256ff1b28350566966b28577d1612a..c87c574f32b4bca706c1e430c8003284d92bc0e2 100644 (file)
--- a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
+++ b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts
@@ -13,6 +13,7 @@
                led-failsafe = &led_power_amber;
                led-running = &led_power_green;
                led-upgrade = &led_power_amber;
+               label-mac-device = &eth0;
        };
 
        leds {

diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
index 8a05da966d53801dacb60a6f13c2e2d9f8e3c34d..828bbd5cae91eab8d0977909cd409b099866bb3c 100644 (file)
--- a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
+++ b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts
@@ -13,6 +13,7 @@
                led-failsafe = &led_power_amber;
                led-running = &led_power_green;
                led-upgrade = &led_power_amber;
+               label-mac-device = &eth0;
        };
 
        leds {

diff --git a/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts b/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts
index de1a9b135e7c5ce8aa57da7c26a165a590da3984..87948f592508f1fa1fc3bc6acb525574ad007709 100644 (file)
--- a/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts
+++ b/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts
@@ -117,7 +117,7 @@
                                                reg = <0x1000 0x440>;
                                        };
 
-                                       macaddr_art_wmac: macaddr@1002 {
+                                       macaddr_art_1002: macaddr@1002 {
                                                reg = <0x1002 0x6>;
                                        };
                                };
@@ -141,8 +141,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/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
index 96b7b69de68ba2775528e27037d29f65fd4dd8a4..808cf1a6f5128aa4291f045cd5229cf38463d06e 100644 (file)
--- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
+++ b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
@@ -9,7 +9,6 @@
        model = "Zyxel NBG6616";
 
        aliases {
-               label-mac-device = &wmac;
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 6bb4e98cd93b628627fe22ca485a5e9042161fa8..f113bd0d95e4c122f95fdb62db317ebd9611f517 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -9,7 +9,6 @@
        model = "Zyxel NBG6716";
 
        aliases {
-               label-mac-device = &wmac;
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;

diff --git a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
index 63b20b4725f21f0538746fd28b6ee718ab68e735..280ece859afa5d84b9027f24294889bbe230303d 100644 (file)
--- a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
+++ b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
@@ -6,6 +6,11 @@
 #include <dt-bindings/input/input.h>
 
 / {
+
+       aliases {
+               label-mac-device = &wmac;
+       };
+
        keys: keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ath79/dts/qca9563_zte_mf281.dts b/target/linux/ath79/dts/qca9563_zte_mf281.dts
index 06a8b2350aba983b3d693194a36c6ed8b6becf17..4da1d9f4fed390806913bce2784545faede00653 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf281.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf281.dts
@@ -9,6 +9,10 @@
        model = "ZTE MF281";
        compatible = "zte,mf281", "qca,qca9563";
 
+       aliases {
+               label-mac-device = &eth0;
+       };
+
        leds {
                pinctrl-names = "default";
                pinctrl-0 = <&enable_wlan_led_gpio>;

diff --git a/target/linux/ath79/dts/qca9563_zte_mf282.dts b/target/linux/ath79/dts/qca9563_zte_mf282.dts
index 12c8f00d1f3b114fadd018be87dd281601df7f31..7442feab96074c8ba547898f2c393debdbae97d7 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf282.dts
+++ b/target/linux/ath79/dts/qca9563_zte_mf282.dts
@@ -10,6 +10,10 @@
        model = "ZTE MF282";
        compatible = "zte,mf282", "qca,qca9563";
 
+       aliases {
+               label-mac-device = &eth0;
+       };
+
        ubi-concat {
                compatible = "mtd-concat";
                devices = <&ubiconcat0 &ubiconcat1>;

diff --git a/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi b/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi
index 1edcd7e5ea68ee7ac27c41f5c49342d410af8046..55c5792bac426675d5af7f801edd027143d34479 100644 (file)
--- a/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi
+++ b/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi
@@ -13,7 +13,6 @@
                led-failsafe = &led_debug;
                led-running = &led_debug;
                led-upgrade = &led_debug;
-               label-mac-device = &eth0;
        };
 
        leds {