aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2022-03-30 00:20:39 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2022-03-30 17:49:06 +0200
commitdfba6e95af7e5fa0a3e0dab6be6acaf25a7693d8 (patch)
tree3b4bc10e05b00f2dee07da37724863a23434afd5
parentb664bb617da44ba40dc5f18b72375ee2bb583d6e (diff)
downloadupstream-dfba6e95af7e5fa0a3e0dab6be6acaf25a7693d8.tar.gz
upstream-dfba6e95af7e5fa0a3e0dab6be6acaf25a7693d8.tar.bz2
upstream-dfba6e95af7e5fa0a3e0dab6be6acaf25a7693d8.zip
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)
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts1
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_unifi.dts1
-rw-r--r--target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi4
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 = &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 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 <dt-bindings/input/input.h>
/ {
+ aliases {
+ label-mac-device = &eth0;
+ };
+
extosc: ref {
compatible = "fixed-clock";
#clock-cells = <0>;