From 14cb05909a8dc6e42008697b4fe47b8fa00789d8 Mon Sep 17 00:00:00 2001 From: Johann Neuhauser Date: Sat, 16 Jun 2018 08:13:09 +0200 Subject: [PATCH] ath79: clean up led config script files for all devices 1. Move all status led definitions out of diag.sh into device dt as we use here a generic script hook. 2. Encode "phy0ptp" led trigger in dt of device for all ath79 devices. Signed-off-by: Johann Neuhauser --- .../ath79/base-files/etc/board.d/01_leds | 5 ---- target/linux/ath79/base-files/etc/diag.sh | 25 ------------------- target/linux/ath79/dts/ar7241_ubnt_unifi.dts | 6 ++++- .../linux/ath79/dts/ar7242_avm_fritz300e.dts | 7 +++++- .../linux/ath79/dts/ar9330_glinet_ar150.dts | 4 ++- .../dts/ar9331_embeddedwireless_dorin.dts | 3 ++- .../linux/ath79/dts/ar9331_etactica-eg200.dts | 1 + 7 files changed, 17 insertions(+), 34 deletions(-) diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds index 4a8b82786e..d1906f9231 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -10,7 +10,6 @@ boardname="${board##*,}" case "$board" in "avm,fritz300e") ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0" - ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt" ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssi0" "wlan0" "1" "100" ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssi1" "wlan0" "20" "100" @@ -20,13 +19,9 @@ case "$board" in ;; "etactica,eg200") ucidef_set_led_netdev "lan" "LAN" "$boardname:red:eth0" "eth0" - ucidef_set_led_wlan "wlan" "WLAN" "$boardname:red:wlan" "phy0tpt" ucidef_set_led_oneshot "modbus" "Modbus" "$boardname:red:modbus" "100" "33" ucidef_set_led_default "etactica" "etactica" "$boardname:red:etactica" "ignore" ;; -"glinet,ar150") - ucidef_set_led_wlan "wlan" "WLAN" "gl-ar150:orange:wlan" "phy0tpt" - ;; "tplink,tl-mr3020-v1") ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x02" ;; diff --git a/target/linux/ath79/base-files/etc/diag.sh b/target/linux/ath79/base-files/etc/diag.sh index 0a5011a7ae..5a21006528 100644 --- a/target/linux/ath79/base-files/etc/diag.sh +++ b/target/linux/ath79/base-files/etc/diag.sh @@ -4,32 +4,7 @@ status_led="$(get_dt_led status)" -get_status_led() { - local board=$(board_name) - local boardname="${board##*,}" - - case $board in - "avm,fritz300e") - status_led="${boardname}:green:power" - ;; - "embeddedwireless,dorin") - status_led="dorin:green:status" - ;; - "glinet,ar150") - status_led="gl-ar150:orange:wlan" - ;; - "tplink,tl-wr1043nd-v1") - status_led="tp-link:green:system" - ;; - "ubnt,unifi") - status_led="ubnt:green:dome" - ;; - esac -} - set_state() { - [ -z "$status_led" ] && get_status_led - case "$1" in preinit) status_led_blink_preinit diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts index bb42017c54..923b3df770 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts @@ -10,6 +10,10 @@ compatible = "ubnt,unifi", "qca,ar7241"; model = "Ubiquiti UniFi AP"; + aliases { + led-status = &dome_green; + }; + memory@0 { device_type = "memory"; reg = <0x0 0x4000000>; @@ -36,7 +40,7 @@ leds { compatible = "gpio-leds"; - dome-green { + dome_green: dome-green { label = "ubnt:green:dome"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts index 1dd1698714..07c1f637cb 100644 --- a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts +++ b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts @@ -10,6 +10,10 @@ compatible = "avm,fritz300e", "qca,ar7242"; model = "AVM FRITZ!WLAN Repeater 300E"; + aliases { + led-status = &power; + }; + memory@0 { device_type = "memory"; reg = <0x0 0x4000000>; @@ -32,7 +36,7 @@ leds { compatible = "gpio-leds"; - power { + power: power { label = "fritz300e:green:power"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; default-state = "on"; @@ -46,6 +50,7 @@ wlan { label = "fritz300e:green:wlan"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; }; }; diff --git a/target/linux/ath79/dts/ar9330_glinet_ar150.dts b/target/linux/ath79/dts/ar9330_glinet_ar150.dts index 1a97a0da30..721cbe7da5 100644 --- a/target/linux/ath79/dts/ar9330_glinet_ar150.dts +++ b/target/linux/ath79/dts/ar9330_glinet_ar150.dts @@ -12,6 +12,7 @@ aliases { serial0 = &uart; + led-status = &wlan; }; memory@0 { @@ -22,10 +23,11 @@ leds { compatible = "gpio-leds"; - wlan { + wlan: wlan { label = "gl-ar150:orange:wlan"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; default-state = "off"; + linux,default-trigger = "phy0tpt"; }; lan { diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts index eff3b091ec..19ec733865 100644 --- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts +++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts @@ -11,6 +11,7 @@ compatible = "embeddedwireless,dorin", "qca,ar9331"; aliases { + led-status = &status; serial0 = &uart; }; @@ -22,7 +23,7 @@ leds { compatible = "gpio-leds"; - status { + status: status { label = "dorin:green:status"; gpios = <&gpio 21 GPIO_ACTIVE_LOW>; default-state = "off"; diff --git a/target/linux/ath79/dts/ar9331_etactica-eg200.dts b/target/linux/ath79/dts/ar9331_etactica-eg200.dts index 1dc96081c2..c245fac7c7 100644 --- a/target/linux/ath79/dts/ar9331_etactica-eg200.dts +++ b/target/linux/ath79/dts/ar9331_etactica-eg200.dts @@ -56,6 +56,7 @@ label = "eg200:red:wlan"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; default-state = "off"; + linux,default-trigger = "phy0tpt"; }; }; }; -- 2.30.2