aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2016-01-01 21:18:21 +0000
committerJohn Crispin <john@openwrt.org>2016-01-01 21:18:21 +0000
commitd7a5d66ea1c1cc771f31c7b2411013038b52f5ba (patch)
treec4ad352f8036746c14306367a5998e35f379e5d1 /target
parenta3042500ab1114bae29ae55071aa3f26fd19c0a4 (diff)
downloadupstream-d7a5d66ea1c1cc771f31c7b2411013038b52f5ba.tar.gz
upstream-d7a5d66ea1c1cc771f31c7b2411013038b52f5ba.tar.bz2
upstream-d7a5d66ea1c1cc771f31c7b2411013038b52f5ba.zip
lantiq: use default leds defined in DTS
Remove all now double defined leds from the led board file. Use pppoe as default for all broadband connections, since it's the default in OpenWrt now. Rename the the wifi leds to make sure, the not applicable default values get overwritten. Signed-off-by: Mathias Kresin <openwrt@kresin.me> SVN-Revision: 48038
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/lantiq/base-files/etc/board.d/01_leds27
-rw-r--r--target/linux/lantiq/base-files/lib/functions/lantiq.sh16
2 files changed, 23 insertions, 20 deletions
diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds
index 9d57cf3912..7a25b6d36f 100755
--- a/target/linux/lantiq/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/base-files/etc/board.d/01_leds
@@ -9,10 +9,10 @@
board_config_update
-[ -e "/sys/class/leds/wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "wifi" "phy0tpt"
-[ -e "/sys/class/leds/usb" ] && ucidef_set_led_usbdev "usb" "usb" "usb" "1-1"
-[ -e "/sys/class/leds/usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "usb2" "2-1"
-[ -e "/sys/class/leds/internet" ] && ucidef_set_led_netdev "internet" "internet" "internet" "pppoe-wan"
+[ -n "$(lantiq_is_dt_led_chosen wifi)" ] && ucidef_set_led_wlan "wifi" "wifi" "$(lantiq_get_dt_led_chosen wifi)" "phy0tpt"
+[ -n "$(lantiq_is_dt_led_chosen usb)" ] && ucidef_set_led_usbdev "usb" "usb" "$(lantiq_get_dt_led_chosen usb)" "1-1"
+[ -n "$(lantiq_is_dt_led_chosen usb2)" ] && ucidef_set_led_usbdev "usb2" "usb2" "$(lantiq_get_dt_led_chosen usb2)" "2-1"
+[ -n "$(lantiq_is_dt_led_chosen internet)" ] && ucidef_set_led_netdev "internet" "internet" "$(lantiq_get_dt_led_chosen internet)" "pppoe-wan"
board=$(lantiq_board_name)
@@ -22,19 +22,12 @@ VG3503J)
;;
BTHOMEHUBV2B)
ucidef_set_led_default "power" "power" "soc:blue:power" "1"
-# ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0radio"
- ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt"
- ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan"
;;
BTHOMEHUBV3A)
ucidef_set_led_default "power" "power" "soc:blue:power" "1"
- ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt"
- ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan"
;;
BTHOMEHUBV5A)
ucidef_set_led_default "power" "power" "soc:blue:power" "1"
- ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt"
- ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan"
ucidef_set_led_default "dimmed" "dimmed" "dimmed" "0"
;;
VGV7510KW22)
@@ -42,33 +35,27 @@ VGV7510KW22)
ucidef_set_led_default "power2" "power2" "power2" "0"
ucidef_set_led_wlan "wifi" "wifi" "wifi" "phy0radio"
ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0"
- ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan"
;;
VGV7519)
ucidef_set_led_default "power" "power" "power" "0"
ucidef_set_led_default "power2" "power2" "power2" "1"
- ucidef_set_led_wlan "wireless_yellow" "wireless_yellow" "wireless_yellow" "phy0radio"
- ucidef_set_led_netdev "internet_yellow" "internet_yellow" "internet_yellow" "nas0"
- ucidef_set_led_netdev "broadband_yellow" "broadband_yellow" "broadband_yellow" "pppoe-wan"
+ ucidef_set_led_wlan "wifi" "wifi" "wireless_yellow" "phy0radio"
+ ucidef_set_led_netdev "broadband_yellow" "broadband_yellow" "broadband_yellow" "nas0"
;;
P2812HNUF*)
ucidef_set_led_default "power" "power" "power" "0"
ucidef_set_led_default "power2" "power2" "power2" "1"
- ucidef_set_led_wlan "wireless_green" "wireless_green" "wireless_green" "phy0radio"
+ ucidef_set_led_wlan "wifi" "wifi" "wireless_green" "phy0radio"
ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0"
- ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan"
;;
ARV7519RW22)
ucidef_set_led_default "power" "power" "power" "1"
- ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan"
ucidef_set_led_netdev "lan" "lan" "lan" "eth0.1"
;;
ARV8539PW22)
ucidef_set_led_default "power" "power" "soc:green:power" "1"
ucidef_set_led_default "power2" "power2" "soc:red:power" "0"
- ucidef_set_led_wlan "wifi" "wifi" "soc:green:wireless" "phy0tpt"
ucidef_set_led_netdev "dsl" "dsl" "soc:green:dsl" "nas0"
- ucidef_set_led_netdev "online" "online" "soc:green:online" "pppoe-wan"
;;
*)
;;
diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh
index 88da794ca9..642ae6b725 100644
--- a/target/linux/lantiq/base-files/lib/functions/lantiq.sh
+++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh
@@ -27,3 +27,19 @@ lantiq_board_name() {
echo "$name"
}
+
+lantiq_is_dt_led_chosen() {
+ [ -f "/sys/firmware/devicetree/base/chosen/leds/$1" ] && echo "true"
+}
+
+lantiq_get_dt_led_chosen() {
+ local label
+ local nodepath
+ local basepath="/sys/firmware/devicetree/base"
+ local chosenpath="$basepath/chosen/leds/$1"
+
+ [ -f "$chosenpath" ] && nodepath=$(cat "$chosenpath")
+ [ -n "$nodepath" ] && label=$(cat "$basepath$nodepath/label")
+
+ echo "$label"
+}