From patchwork Thu Dec 24 12:28:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 560915 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 14CF7140C36 for ; Thu, 24 Dec 2015 23:34:50 +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=VD3DQaxA; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id ACFB5280143; Thu, 24 Dec 2015 13:30:20 +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 0A14828BCF4 for ; Thu, 24 Dec 2015 13:29:00 +0100 (CET) X-policyd-weight: using cached result; rate: -5.5 Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 24 Dec 2015 13:28:49 +0100 (CET) Received: by mail-wm0-f45.google.com with SMTP id l126so183221697wml.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=Sb1iuKiygLdmkowRLDii3LOonKV2PyI9r3REclxrBDc=; b=VD3DQaxA5NOSnZUTr/32sfsK11aImkEXqWxzknaecMZAPC+Jb8F22yW5VEB/PImvaR 05JeOCz2cgGh729qrm6nx0KYPzAt+GN239JPbjDq9mumFnY73L8iXDBMo8CdcSdKr7/n ohvMXXINhtBa5mscMPtnosy/Op2qNFdLy/MVKYOTZgfcbv+HjrCJ1CCUUCE4LddPuxXy NZzlE3RLGQgLDKEs7r4qXKJBjd81CPsSVXw+RhNaZmwSp5NB4QCUj7YCARvIE1A4xcQW Q0L+AhvEXLV3XO5an1WrXVCLIJ5ASZwchrcIS8++M5jaGHBqVmQUT0npaTEtmpvsd+GI 5XAA== 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=Sb1iuKiygLdmkowRLDii3LOonKV2PyI9r3REclxrBDc=; b=JCYGG8gtaiLlfYZJ6cm3Za+2m6w2QrBpgGlYXEJgLFAAC68V4gS7XiFCzBYlizQm9f s/XDvWJ+fRb+em6erC5I0uJlHY/USs07U8qAQDXfEH2QO9yX7Fi/DsecFUvkAwtz/lEO bdiNUdU02oD0x4Zztgtu55v+EKsPTTZnq9hZha6WAuc7snp1nqwPIHz0Ep4lxaHKlSWF PBpwLIkaA875z23cTTbBbaAxMKnfu+2E2QLYW+19vH+2hLaA9G00e07IjzuOQ4C0U0P/ PJ/LBi3GWDM7mD4DroAhPP7eWW1cJ2vmoj3tb4HARm/ld7guoQ5XTCc6RSOdHZRKvQr7 s6Dg== X-Gm-Message-State: ALoCoQlE+Kn+Z8Y+UGk82QltlTHPcHq6meoEW5/un2IYXjXgnXLC5M9kxbeWQiVS8fdJOulx+ldO/LJzRj7F4wIK/1xPkf4cXw== X-Received: by 10.194.133.100 with SMTP id pb4mr46533926wjb.133.1450960149142; Thu, 24 Dec 2015 04:29:09 -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.08 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:54 +0100 Message-Id: <1450960137-22752-10-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 09/12] lantiq: use power 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" Use the power leds defined in the dts file instead of hardcoded led names. Signed-off-by: Mathias Kresin --- target/linux/lantiq/base-files/etc/diag.sh | 34 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/target/linux/lantiq/base-files/etc/diag.sh b/target/linux/lantiq/base-files/etc/diag.sh index 57a7055..0e65e61 100644 --- a/target/linux/lantiq/base-files/etc/diag.sh +++ b/target/linux/lantiq/base-files/etc/diag.sh @@ -2,49 +2,53 @@ # Copyright (C) 2012-2013 OpenWrt.org . /lib/functions/leds.sh +. /lib/functions/lantiq.sh -status_led=power -[ ! -d /sys/class/leds/power/ ] && [ ! -d /sys/class/leds/power1/ ] && [ ! -d /sys/class/leds/power2/ ] && [ -d /sys/class/leds/wps/ ] && status_led=wps +power="$(lantiq_get_dt_led_chosen power)" +power1="$(lantiq_get_dt_led_chosen power1)" +power2="$(lantiq_get_dt_led_chosen power2)" + +status_led="$power" set_state() { case "$1" in preinit) - if [ -d /sys/class/leds/power2/ ]; then + if [ -n "$power2" ]; then status_led_on - status_led=power2 + status_led="$power2" status_led_blink_preinit - status_led=power + status_led="$power" else status_led_blink_preinit fi ;; failsafe) - if [ -d /sys/class/leds/power2/ ]; then - led_off power2 + if [ -n "$power2" ]; then + led_off "$power2" status_led_blink_failsafe - elif [ -d /sys/class/leds/power1/ ]; then + elif [ -n "$power1" ]; then status_led_off - status_led=power1 + status_led="$power1" status_led_blink_failsafe - status_led=power + status_led="$power" else status_led_blink_failsafe fi ;; preinit_regular) - if [ -d /sys/class/leds/power2/ ]; then + if [ -n "$power2" ]; then status_led_on - status_led=power2 + status_led="$power2" status_led_blink_preinit_regular - status_led=power + status_led="$power" else status_led_blink_preinit_regular fi ;; done) status_led_on - led_off power1 - led_off power2 + led_off "$power1" + led_off "$power2" ;; esac }