From patchwork Wed Dec 23 16:29:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 560620 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B7CD140BFD for ; Thu, 24 Dec 2015 03:37:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b=N2dKtauW; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A068928BC3B; Wed, 23 Dec 2015 17:32:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C687F280342 for ; Wed, 23 Dec 2015 17:29:49 +0100 (CET) X-policyd-weight: using cached result; rate: -5.5 Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 23 Dec 2015 17:29:16 +0100 (CET) Received: by mail-wm0-f42.google.com with SMTP id l126so152589737wml.1 for ; Wed, 23 Dec 2015 08:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=+AMm9FG+LZpY7fyM1OjE57c5GJDfi8w2Ra7QHzOzQJE=; b=N2dKtauWv8BTXI+2YrjC9bBC7dyFnTcrtpNw8spueSp00j/bRQQEirmjRGNOYOkWef w2EzzxSNMeDA7vok3KYR2VC1qxC9tafuTs7ibAQQ5bzthhO+tmqY2V4Q4vYHNQVQF2yb iy4EbSD6zo4+nWdRm2DHLZpsSdvyggbbaVFbJF/o2QqP/XzvxJZisBLH4gsRUbIieIZl diAc8Ad87nDhYdZP+lx9liuLa2z31LO4vSG7TwKFpXe870luw31wQD3/28EXc1SUe6z8 zB6sQbYL703hazl0PMAkafiatTNpooPABHNaJiSJULxIWulHVwkEFXkKUWQDe34v9vMi Xwrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+AMm9FG+LZpY7fyM1OjE57c5GJDfi8w2Ra7QHzOzQJE=; b=NtKUScH5OcoXnTyUuedeWDQmYYRxldFGuwcoPzbpotMnuptcZMT70d32q8mNgvs+co fOoNWl638Qx1LUP/MOuGz4Otj0AkhWqHVilPlI1IHbO/OyJMYbMjMNEjwZ4L2dSAC4mq e3cwzGdOxUzdr2NzOK+0hPAYD/9+t4yIgGutmxxHaoU6t0px3DtnM+6nPzyqEcDcOCvR TVKrtToNJadb4YWwZlZTryjAEtFjAy/SnQiMBx0k4dUb9lZ8+cWR2VI326d6QV215xmi ksMujeOm8X3YMVpT8EwYLJUZa5RHGYtr3c/alYeVkuJ0nuFxZ3V+7oIy5n4/wtXwtB9B /T8g== X-Gm-Message-State: ALoCoQneY5+98V317PY62IEH2qanxiYHb1jgDJKdPunP8VedlqdrfTPJwPZugV/o1U7W2MdWo19lTzn5NyUaTxTya3n4pDrTXQ== X-Received: by 10.194.238.162 with SMTP id vl2mr10797650wjc.91.1450888176028; Wed, 23 Dec 2015 08:29:36 -0800 (PST) Received: from desktop.wvd.kresin.me (p54AF4BC9.dip0.t-ipconnect.de. [84.175.75.201]) by smtp.gmail.com with ESMTPSA id u126sm29846711wme.3.2015.12.23.08.29.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 08:29:35 -0800 (PST) From: Mathias Kresin To: openwrt-devel@lists.openwrt.org Date: Wed, 23 Dec 2015 17:29:17 +0100 Message-Id: <1450888159-449-11-git-send-email-openwrt@kresin.me> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450888159-449-1-git-send-email-openwrt@kresin.me> References: <1450888159-449-1-git-send-email-openwrt@kresin.me> Subject: [OpenWrt-Devel] [PATCH 10/12] lantiq: use dsl led defined in DTS X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- target/linux/lantiq/base-files/etc/board.d/01_leds | 19 +++++++++++-------- target/linux/lantiq/base-files/sbin/dsl_notify.sh | 14 +++++++------- target/linux/lantiq/dts/ARV452CQW.dts | 2 +- target/linux/lantiq/dts/VG3503J.dtsi | 2 +- 4 files changed, 20 insertions(+), 17 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 7a25b6d..a95c72c 100755 --- a/target/linux/lantiq/base-files/etc/board.d/01_leds +++ b/target/linux/lantiq/base-files/etc/board.d/01_leds @@ -12,14 +12,21 @@ board_config_update [ -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 @@ VGV7510KW22) 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 @@ ARV7519RW22) 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" ;; *) ;; diff --git a/target/linux/lantiq/base-files/sbin/dsl_notify.sh b/target/linux/lantiq/base-files/sbin/dsl_notify.sh index b514e25..01d0488 100755 --- a/target/linux/lantiq/base-files/sbin/dsl_notify.sh +++ b/target/linux/lantiq/base-files/sbin/dsl_notify.sh @@ -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 diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts index 320e5f5..38618f1 100644 --- a/target/linux/lantiq/dts/ARV452CQW.dts +++ b/target/linux/lantiq/dts/ARV452CQW.dts @@ -9,7 +9,7 @@ bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; leds { - dsl = &dsl; + internet = &dsl; power1 = &power1; usb = &usb; wifi = &wifi; diff --git a/target/linux/lantiq/dts/VG3503J.dtsi b/target/linux/lantiq/dts/VG3503J.dtsi index 50ab0b6..e567923 100644 --- a/target/linux/lantiq/dts/VG3503J.dtsi +++ b/target/linux/lantiq/dts/VG3503J.dtsi @@ -7,7 +7,7 @@ bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; leds { - dsl = &dsl; + internet = &dsl; power = &power; power2 = &power2; };