Author: blogic Date: 2016-01-01 22:18:38 +0100 (Fri, 01 Jan 2016) New Revision: 48040
Modified: trunk/target/linux/lantiq/base-files/etc/board.d/01_leds trunk/target/linux/lantiq/base-files/sbin/dsl_notify.sh trunk/target/linux/lantiq/dts/ARV452CQW.dts trunk/target/linux/lantiq/dts/VG3503J.dtsi Log: lantiq: use dsl led defined in DTS dsl_control (dsl_notify.sh) is the only process which is aware of the state of the atm/ptm interface. Use the dsl led exclusive for the dsl line state. On boards which don't have a distinct internet and a dsl led, let the netdev status of the atm interface trigger the shared led. Triggering the shared led according to the status of the ppp interface isn't suitable, since the led would be switched of if the ppp connection goes down, but the line is still in sync. Signed-off-by: Mathias Kresin <[email protected]> Modified: trunk/target/linux/lantiq/base-files/etc/board.d/01_leds =================================================================== --- trunk/target/linux/lantiq/base-files/etc/board.d/01_leds 2016-01-01 21:18:30 UTC (rev 48039) +++ trunk/target/linux/lantiq/base-files/etc/board.d/01_leds 2016-01-01 21:18:38 UTC (rev 48040) @@ -12,14 +12,21 @@ [ -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" +[ -n "$(lantiq_is_dt_led_chosen internet)" ] && { + interface="nas0" + + [ -n "$(lantiq_is_dt_led_chosen dsl)" ] && { + interface="pppoe-wan" + ucidef_set_led_default "dsl" "dsl" "$(lantiq_get_dt_led_chosen dsl)" "0" + } + + ucidef_set_led_netdev "internet" "internet" "$(lantiq_get_dt_led_chosen internet)" "$interface" +} + board=$(lantiq_board_name) case "$board" in -VG3503J) - ucidef_set_led_netdev "vdsl" "vdsl" "bt:green:dsl" "ptm0" - ;; BTHOMEHUBV2B) ucidef_set_led_default "power" "power" "soc:blue:power" "1" ;; @@ -34,19 +41,16 @@ ucidef_set_led_default "power" "power" "power" "1" ucidef_set_led_default "power2" "power2" "power2" "0" ucidef_set_led_wlan "wifi" "wifi" "wifi" "phy0radio" - ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0" ;; VGV7519) ucidef_set_led_default "power" "power" "power" "0" ucidef_set_led_default "power2" "power2" "power2" "1" 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 "wifi" "wifi" "wireless_green" "phy0radio" - ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0" ;; ARV7519RW22) ucidef_set_led_default "power" "power" "power" "1" @@ -55,7 +59,6 @@ ARV8539PW22) ucidef_set_led_default "power" "power" "soc:green:power" "1" ucidef_set_led_default "power2" "power2" "soc:red:power" "0" - ucidef_set_led_netdev "dsl" "dsl" "soc:green:dsl" "nas0" ;; *) ;; Modified: trunk/target/linux/lantiq/base-files/sbin/dsl_notify.sh =================================================================== --- trunk/target/linux/lantiq/base-files/sbin/dsl_notify.sh 2016-01-01 21:18:30 UTC (rev 48039) +++ trunk/target/linux/lantiq/base-files/sbin/dsl_notify.sh 2016-01-01 21:18:38 UTC (rev 48040) @@ -16,15 +16,15 @@ include /lib/network scan_interfaces -local default +local led config_load system -config_get default led_adsl default -if [ "$default" != 1 ]; then +config_get led led_dsl sysfs +if [ -n "$led" ]; then case "$DSL_INTERFACE_STATUS" in - "HANDSHAKE") led_timer dsl 500 500;; - "TRAINING") led_timer dsl 200 200;; - "UP") led_on dsl;; - *) led_off dsl + "HANDSHAKE") led_timer $led 500 500;; + "TRAINING") led_timer $led 200 200;; + "UP") led_on $led;; + *) led_off $led esac fi Modified: trunk/target/linux/lantiq/dts/ARV452CQW.dts =================================================================== --- trunk/target/linux/lantiq/dts/ARV452CQW.dts 2016-01-01 21:18:30 UTC (rev 48039) +++ trunk/target/linux/lantiq/dts/ARV452CQW.dts 2016-01-01 21:18:38 UTC (rev 48040) @@ -9,7 +9,7 @@ bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; leds { - dsl = &dsl; + internet = &dsl; power1 = &power1; usb = &usb; wifi = &wifi; Modified: trunk/target/linux/lantiq/dts/VG3503J.dtsi =================================================================== --- trunk/target/linux/lantiq/dts/VG3503J.dtsi 2016-01-01 21:18:30 UTC (rev 48039) +++ trunk/target/linux/lantiq/dts/VG3503J.dtsi 2016-01-01 21:18:38 UTC (rev 48040) @@ -7,7 +7,7 @@ bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; leds { - dsl = &dsl; + internet = &dsl; power = &power; power2 = &power2; }; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
