ath79: engenius: remove userspace label mac

Can be handled easily in dts.

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

diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
index 03d89be0c4b6748542f02c717c8275aa9c0405ed..993aa3717d25abfc1547c07574416c8c85bcb737 100644 (file)
--- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
@@ -12,6 +12,7 @@
        compatible = "engenius,eap300-v2", "qca,ar9341";
 
        aliases {
+               label-mac-device = &wmac;
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;
@@ -49,8 +50,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 = <17>;
@@ -71,5 +72,9 @@
                cal_art_1000: calibration@1000 {
                        reg = <0x1000 0x440>;
                };
+
+               macaddr_art_1002: macaddr@1002 {
+                       reg = <0x1002 0x6>;
+               };
        };
 };

diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index d4bf2aa4367d62bd0f410e2ce638d16039caccf9..f2315378ef6634290cf8a71c3d655afe2b4ad21e 100644 (file)
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -12,6 +12,7 @@
        compatible = "engenius,ens202ext-v1", "qca,ar9341";
 
        aliases {
+               label-mac-device = &wmac;
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;
@@ -80,8 +81,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 = <18>;
@@ -102,5 +103,9 @@
                cal_art_1000: calibration@1000 {
                        reg = <0x1000 0x440>;
                };
+
+               macaddr_art_1002: macaddr@1002 {
+                       reg = <0x1002 0x6>;
+               };
        };
 };

diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 6be9d44cf8cce8e6e5f5d43103add0651e074634..28216247b19536093ea71aaac7843a6454a86ea5 100644 (file)
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -641,9 +641,7 @@ ath79_setup_macs()
        alfa-network,pi-wifi4|\
        alfa-network,r36a|\
        alfa-network,tube-2hq|\
-       alfa-network,wifi-camppro-nano-duo|\
-       engenius,eap300-v2|\
-       engenius,ens202ext-v1)
+       alfa-network,wifi-camppro-nano-duo)
                label_mac=$(mtd_get_mac_binary art 0x1002)
                ;;
        arduino,yun)