KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lantiq: cleanup led handling functions

Browse source 
Use a more generic name for the lantiq_get_dt_led_chosen function.

Drop the lantiq_is_dt_led_chosen function. The lantiq_get_dt_led
function can be used to achieve the same.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2016-10-04 20:30:34 +02:00
parent dbb13a81b9
commit 8b639410d1
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
target/linux/lantiq/base-files/etc/board.d/01_leds
View file

@ -9,19 +9,26 @@
board_config_update board_config_update
[ -n "$(lantiq_is_dt_led_chosen wifi)" ] && ucidef_set_led_wlan "wifi" "wifi" "$(lantiq_get_dt_led_chosen wifi)" "phy0tpt" led_wifi="$(lantiq_get_dt_led wifi)"
[ -n "$(lantiq_is_dt_led_chosen usb)" ] && ucidef_set_led_usbdev "usb" "usb" "$(lantiq_get_dt_led_chosen usb)" "1-1" [ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt"
[ -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)" ] && { led_usb="$(lantiq_get_dt_led usb)"
[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1"
led_usb2="$(lantiq_get_dt_led usb2)"
[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1"
led_internet="$(lantiq_get_dt_led internet)"
[ -n "$led_internet" ] && {
interface="nas0" interface="nas0"
[ -n "$(lantiq_is_dt_led_chosen dsl)" ] && { led_dsl="$(lantiq_get_dt_led dsl)"
[ -n "$led_dsl" ] && {
interface="pppoe-wan" interface="pppoe-wan"
ucidef_set_led_default "dsl" "dsl" "$(lantiq_get_dt_led_chosen dsl)" "0" ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0"
} }
ucidef_set_led_netdev "internet" "internet" "$(lantiq_get_dt_led_chosen internet)" "$interface" ucidef_set_led_netdev "internet" "internet" "$led_internet" "$interface"
} }
board=$(lantiq_board_name) board=$(lantiq_board_name)

6
target/linux/lantiq/base-files/etc/diag.sh
View file

@ -4,9 +4,9 @@
. /lib/functions/leds.sh . /lib/functions/leds.sh
. /lib/functions/lantiq.sh . /lib/functions/lantiq.sh
boot="$(lantiq_get_dt_led_chosen boot)" boot="$(lantiq_get_dt_led boot)"
failsafe="$(lantiq_get_dt_led_chosen failsafe)" failsafe="$(lantiq_get_dt_led failsafe)"
running="$(lantiq_get_dt_led_chosen running)" running="$(lantiq_get_dt_led running)"
set_state() { set_state() {
status_led="$boot" status_led="$boot"

14
target/linux/lantiq/base-files/lib/functions/lantiq.sh
View file

@ -28,18 +28,14 @@ lantiq_board_name() {
echo "$name" echo "$name"
} }
lantiq_is_dt_led_chosen() { lantiq_get_dt_led() {
[ -f "/sys/firmware/devicetree/base/chosen/leds/$1" ] && echo "true"
}
lantiq_get_dt_led_chosen() {
local label local label
local nodepath local ledpath
local basepath="/sys/firmware/devicetree/base" local basepath="/sys/firmware/devicetree/base"
local chosenpath="$basepath/chosen/leds/$1" local nodepath="$basepath/chosen/leds/$1"
[ -f "$chosenpath" ] && nodepath=$(cat "$chosenpath") [ -f "$nodepath" ] && ledpath=$(cat "$nodepath")
[ -n "$nodepath" ] && label=$(cat "$basepath$nodepath/label") [ -n "$ledpath" ] && label=$(cat "$basepath$ledpath/label")
echo "$label" echo "$label"
} }