hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ramips: fix LED labels for Asus RT-AC65P 

The leds block was copied over from the RT-AC85P DTS to the common
DTSI while keeping the device-specific model name in the label.

This moves the LEDs back to the DTS files and adjusts the names to
properly resemble the model name of the devices used at, just like
it is handled on most other devices.

Fixes: 7c5f712e4f ("ramips: add support for Asus RT-AC65P")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
master
Adrian Schmutzler 2020-08-17 14:57:52 +02:00
parent e38d89ea55
commit 03cdbb2040
4 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts
View File

@ -6,4 +6,32 @@
/ { / {
compatible = "asus,rt-ac65p", "mediatek,mt7621-soc"; compatible = "asus,rt-ac65p", "mediatek,mt7621-soc";
model = "ASUS RT-AC65P"; model = "ASUS RT-AC65P";
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};
leds {
compatible = "gpio-leds";
led_power: power {
label = "rt-ac65p:blue:power";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan5g {
label = "rt-ac65p:blue:wlan5g";
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1radio";
};
wlan2g {
label = "rt-ac65p:blue:wlan2g";
gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0radio";
};
};
}; };

28
target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts
View File

@ -6,4 +6,32 @@
/ { / {
compatible = "asus,rt-ac85p", "mediatek,mt7621-soc"; compatible = "asus,rt-ac85p", "mediatek,mt7621-soc";
model = "ASUS RT-AC85P"; model = "ASUS RT-AC85P";
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};
leds {
compatible = "gpio-leds";
led_power: power {
label = "rt-ac85p:blue:power";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan5g {
label = "rt-ac85p:blue:wlan5g";
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1radio";
};
wlan2g {
label = "rt-ac85p:blue:wlan2g";
gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0radio";
};
};
}; };

27
target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
View File

@ -6,13 +6,6 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};
keys { keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
@ -28,26 +21,6 @@
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;
}; };
}; };
leds {
compatible = "gpio-leds";
led_power: power {
label = "rt-ac85p:blue:power";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan2g {
label = "rt-ac85p:blue:wlan2g";
gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0radio";
};
wlan5g {
label = "rt-ac85p:blue:wlan5g";
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1radio";
};
};
}; };
&i2c { &i2c {

3
target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration
View File

@ -5,6 +5,9 @@ board=$(board_name)
boardonly="${board##*,}" boardonly="${board##*,}"
case "$board" in case "$board" in
asus,rt-ac65p)
migrate_leds "^rt-ac85p:=rt-ac65p:"
;;
mikrotik,routerboard-750gr3) mikrotik,routerboard-750gr3)
migrate_leds "^rb750gr3:=$boardonly:" migrate_leds "^rb750gr3:=$boardonly:"
;; ;;