ath79: fix label MAC address for Ubiquiti UniFi AP Outdoor+

The label has the MAC address of eth0, not the WLAN PHY address. We can
merge the definition back into ar7241_ubnt_unifi.dtsi, as both DTS
derived from it use the same interface for their label MAC addresses
after all.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit aee9ccf5c1b536189ebee8c232273657334da843)

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 b5d7af421d09499adbf36c516b2bf2b369d05f85..9ccbdbd450d40e09cf9f5450048bdfae3a3d2e50 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
@@ -7,7 +7,6 @@
        model = "Ubiquiti UniFi AP Outdoor+";
 
        aliases {
-               label-mac-device = &wifi;
                led-boot = &led_white;
                led-failsafe = &led_white;
                led-running = &led_blue;

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index c43867a3eb2da66249b8ba47a036d55469d20baa..3c50e89d0175ef7445a5e2855d0a394b21fac221 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -7,7 +7,6 @@
        model = "Ubiquiti UniFi AP";
 
        aliases {
-               label-mac-device = &eth0;
                led-boot = &led_dome_green;
                led-failsafe = &led_dome_green;
                led-running = &led_dome_green;

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
index ac8c0cc709b46525d3263f63c90590bd5f1f7add..d05ed080a8c5f986ceffec5016b0e47f3ed8f68a 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
@@ -6,6 +6,10 @@
 #include <dt-bindings/input/input.h>
 
 / {
+       aliases {
+               label-mac-device = &eth0;
+       };
+
        extosc: ref {
                compatible = "fixed-clock";
                #clock-cells = <0>;