diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2022-03-30 00:20:39 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2022-03-30 17:49:43 +0200 |
| commit | f6513143addb6585b5133f12523bfc3950ae7dbb (patch) | |
| tree | e85f9bc97f9b774f6e0b1e083938bea1891b57e5 | |
| parent | 5cf00adf21330a710a2bae2e7952718f3b1cdf22 (diff) | |
| download | upstream-f6513143addb6585b5133f12523bfc3950ae7dbb.tar.gz upstream-f6513143addb6585b5133f12523bfc3950ae7dbb.tar.bz2 upstream-f6513143addb6585b5133f12523bfc3950ae7dbb.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.dts | 1 | ||||
| -rw-r--r-- | target/linux/ath79/dts/ar7241_ubnt_unifi.dts | 1 | ||||
| -rw-r--r-- | 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 = ð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 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 = ð0; + }; + extosc: ref { compatible = "fixed-clock"; #clock-cells = <0>; |