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 6bb15f8d46ccb996d5f11c9e6213591a9f1b17cf..68f83f7a665a348cead35afab8b9a3d4ac19ae4a 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 c4f3907aaae57be03100a129856af3e96c1e92a6..287e8cc7db668e1c72a3cd8f7ac1ecd48206c509 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";
 
        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 471309136752ede6cea68a51c05e9cbe9153cb3c..ab0372ea9fb5a8f619c9dcb80dd594480cabcafa 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>;