From dfba6e95af7e5fa0a3e0dab6be6acaf25a7693d8 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 30 Mar 2022 00:20:39 +0200 Subject: [PATCH] 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 (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 b5d7af421d..9ccbdbd450 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 c43867a3eb..3c50e89d01 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 AP"; aliases { - label-mac-device = ð0; 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 ac8c0cc709..d05ed080a8 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi @@ -6,6 +6,10 @@ #include / { + aliases { + label-mac-device = ð0; + }; + extosc: ref { compatible = "fixed-clock"; #clock-cells = <0>; -- 2.30.2