[openwrt/openwrt] ath79: fix label MAC address for Ubiquiti UniFi AP Outdoor+

[LEDE Commits]

neoraider pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/f6513143addb6585b5133f12523bfc3950ae7dbb

commit f6513143addb6585b5133f12523bfc3950ae7dbb
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Wed Mar 30 00:20:39 2022 +0200

    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 at universe-factory.net>
    (cherry picked from commit aee9ccf5c1b536189ebee8c232273657334da843)
---
 target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts | 1 -
 target/linux/ath79/dts/ar7241_ubnt_unifi.dts                 | 1 -
 target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi                | 4 ++++
 3 files changed, 4 insertions(+), 2 deletions(-)

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 6bb15f8d46..68f83f7a66 100644
--- 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 c4f3907aaa..287e8cc7db 100644
--- 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 4713091367..ab0372ea9f 100644
--- 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>;