From patchwork Thu Dec 24 12:28:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 560916 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 2F6FB140C36 for ; Thu, 24 Dec 2015 23:35:34 +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=oRKlCS+G; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 0053D28BF04; Thu, 24 Dec 2015 13:30:47 +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 A837428BDA3 for ; Thu, 24 Dec 2015 13:28:53 +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 ; Thu, 24 Dec 2015 13:28:48 +0100 (CET) Received: by mail-wm0-f42.google.com with SMTP id p187so178766767wmp.1 for ; Thu, 24 Dec 2015 04:29:09 -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=fBZVBXlF0/4gv32QezDP4s9HRPFr23I6Kvyddtqwzd4=; b=oRKlCS+GKQhn/APZCkWhClXad0f34aF7c0Q5qZhk4xmKtBe+vnpi/iNWCWQbsCpRgS XWfwmsc9age7cCz8wwNckxCPmLANn3cPuI/iahVywr905NnZ0Wfx4MXETcg/wuqmsfyF UhCOThTWO8gclMMkGkf+LNBgcldNdJRyAKib5WJlvPzJHo2WaKX+P3BuNKS5syAvSjLo Uj0bqqFyox2BwNvAgzsosGE7Q2hh9zJsPsfLtkjOaJI/CZeHgGjxui8lfKnAKni5ZaIS 34P4gyGtj7JDbOUpRJFsnFnGjJrPMw2PHQoxKZfw/Mv5hUjb8NahhHTP4Zot/QzxWHDE Mdxw== 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=fBZVBXlF0/4gv32QezDP4s9HRPFr23I6Kvyddtqwzd4=; b=OTJfKNWhoa+SRKdN9J48WQ8lZm4NE61IIgePn0qZIgzUN1NPseueYjHvJmP0WPtpkb FW6V/qWIKddwq1RgLpC9EcOph+tZJyUSEszF9lPTwozOTg68rl3ZOwU/xo1b9UJ+CYe8 f0yAIM5bUNvwxR94DZqoD0dgh45ny/PvlvaxjLl096t2W2+p6Li1BGaQzNZp+RaTBcbA w3kM3oinVM+Ywm1Ef6q4H0QRkjcYwWHxs6p7C2+IHkCm1ejES9HLz59ZLoK2u6tR08Un /f2Kf0l/SxuuIlptjSNZRn2IwC4Taru5Y7nFk46nC+oEcIiFTh5lW4b1p/Qlo5krPpbv M33w== X-Gm-Message-State: ALoCoQnrXBqR9Dm7boLCG402gSBbkbiVVnMbMEQNGBOn/1fUoXse+mz3fe4uDhB7Zu6OjgU3wAZ8IJHXk1wU6R1p/yEcfunuEA== X-Received: by 10.28.148.140 with SMTP id w134mr41388415wmd.66.1450960148366; Thu, 24 Dec 2015 04:29:08 -0800 (PST) Received: from desktop.wvd.kresin.me (p54AF4408.dip0.t-ipconnect.de. [84.175.68.8]) by smtp.gmail.com with ESMTPSA id l194sm6292996wmb.14.2015.12.24.04.29.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Dec 2015 04:29:08 -0800 (PST) From: Mathias Kresin To: openwrt-devel@lists.openwrt.org Date: Thu, 24 Dec 2015 13:28:53 +0100 Message-Id: <1450960137-22752-9-git-send-email-openwrt@kresin.me> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450960137-22752-1-git-send-email-openwrt@kresin.me> References: <1450960137-22752-1-git-send-email-openwrt@kresin.me> Subject: [OpenWrt-Devel] [PATCH v2 08/12] lantiq: use default leds 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" 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 --- target/linux/lantiq/base-files/etc/board.d/01_leds | 27 ++++++---------------- .../lantiq/base-files/lib/functions/lantiq.sh | 16 +++++++++++++ 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 9d57cf3..7a25b6d 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 88da794..642ae6b 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" +}