From patchwork Sun Aug 16 13:22:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1345478 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=UmKZ+w/D; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BTybz51lZz9sTR for ; Sun, 16 Aug 2020 23:25:51 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ps3/wTGuaz2ux5RzHkYKwK3GJh/L1kkeKqvwXh7e0PM=; b=UmKZ+w/Dni2PjskZdBVV9fx1Xc VaN4o3I2awN7IRm+wZq/oc6kCsZebAXGtBQompBdLsqr1Rb/ptnOR1mVx7H3S3k7HSa1ZEpsA8v3R iekxudEuu7i5hqWB87ThWdoIapsZoQnQ07Fq1k0Pzl/bYZd7xIxs4DcAJTa5z9MfxrcxbXD3AGc3D YPIndTfp82UIVoD3c3xrHNHeMlZMLTGK991fafiCi9Jura2gL1utIAYWUVuoBf4NpEReTxaqE23I6 OEIAYaTZexTvOrg+gBQ5fF6erExY7twpvvIql2Df5N8A/l98Gqdzfw14LByosUFkXOHdY5B1uBzLH 6gHkVuRw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7Id9-0004Tk-PT; Sun, 16 Aug 2020 13:23:23 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7Id6-0004TD-3X for openwrt-devel@lists.openwrt.org; Sun, 16 Aug 2020 13:23:21 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mvs2R-1kzg8N3L2F-00syRW for ; Sun, 16 Aug 2020 15:23:12 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] pistachio: use generic diag.sh Date: Sun, 16 Aug 2020 15:22:27 +0200 Message-Id: <20200816132227.1650-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200816132227.1650-1-freifunk@adrianschmutzler.de> References: <20200816132227.1650-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:AhONeTiwkTQFuuHRZuornjroJXk1ysSXzXTxLTPQImZduDwgF/u MPu83tLsqM/N5VdObQIbZ62Je9CmcMKHuquwWw9AlAFrwMfblDXRtp4QowB1hJ7Y7sWjxel p5LYuwWYUxY515v4Kj42IXAoWZZ0PtQNUBrrQmf4IDfKswzJq0PFLmjdO/a4HXvehd3r/M+ cDuTNRMzL83FptbmQ5Mxw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:TgmV+Cv1118=:ZAwfPJKhLJNTT6cxcfhGOX 5NaxC6C782VT1jct7A84piStlAGcTbotoG3O/jusduV1rGQboLUJEGlpx+qhs7I0ScdxKELMD tOsHDAi+2DCNkjryPCqd45qtZ4ZqoYanqm89b4ZnFMq0LjOevt/i82zHcV9vNXDYl7t4uqhgh HRwjx21pHf2R8b3pXeCJtj3+citgFrhfac/pJhCcst304QMFJU0+F9JjxIBcQS/zCLpW/Ip+N aHjmsfdfnXppgFcpkLTMvZWPIC01anVPOYIxixMQOuNDIbxVcECGykSnBEp3PYB8D4a658a8e gbE6tyrLstk++6+o7wEinNbe/MkaxzhGO62K2LDSmm1uZ2/3n2qb/CaawQT2YVb43Y4hDFkcX unpDFhm28DRiP7y6TMHfAxaQhKEgfRlSDrxNDnp7Ht+IpyOHZOfiC06u15C3LKm/jusjWoDu6 Hh2k1r+UEKZqskKZwGixFz92aa4quqsb81aEy1zKKi+19F6T04KadWgJ13eiWpXCufZGMOV/q 7Dn8beL7yYXOD7L04AdHOorZVOuXHHsattD5Sm846+/fBZEs1cJvVmpVOO++TgaAsIP/pIaaR l4yDOY+06vcWuiRSTYBt8k4U2WTXLRMz/LfCTT8zr18a5IM1noyjriAWSJlpURy0JpKc3bsgs qRgJ9TWTvjkBN7O2+J3k4G8rUSri96ReobkQSdIMYIMYpu1E5TYKxggVBuDYEzKTC+3C+qL1Y 72Q8YXjG08e7hPXEpcNZ2s9sDadyTfc5wDvSKVutn1dq/DIwixXM0bbaB+EEFf2synmjR5noK 3N2KWuxS6jru70st5Rq2QaPRLJC4JG8r7fNGHXMxl8N+Ol+UvPGEd3YrY2SEnWTx68CCzg+Lr 5alBo03kj4iGzy8/7xuw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200816_092320_380674_9FF135E8 X-CRM114-Status: GOOD ( 13.62 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Remove local diag.sh in favor of generic one and add led-* aliases to DTS. Signed-off-by: Adrian Schmutzler --- target/linux/pistachio/base-files/etc/diag.sh | 30 ------------------- .../903-MIPS-DTS-img-add-led-aliases.patch | 27 +++++++++++++++++ 2 files changed, 27 insertions(+), 30 deletions(-) delete mode 100755 target/linux/pistachio/base-files/etc/diag.sh create mode 100644 target/linux/pistachio/patches-5.4/903-MIPS-DTS-img-add-led-aliases.patch diff --git a/target/linux/pistachio/base-files/etc/diag.sh b/target/linux/pistachio/base-files/etc/diag.sh deleted file mode 100755 index ed69d43385..0000000000 --- a/target/linux/pistachio/base-files/etc/diag.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2017 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -. /lib/functions/leds.sh - -status_led="marduk:red:heartbeat" - -set_state() { - - case "$1" in - preinit) - status_led_blink_preinit - ;; - failsafe) - status_led_blink_failsafe - ;; - upgrade | \ - preinit_regular) - status_led_blink_preinit_regular - ;; - done) - status_led_on - ;; - esac -} diff --git a/target/linux/pistachio/patches-5.4/903-MIPS-DTS-img-add-led-aliases.patch b/target/linux/pistachio/patches-5.4/903-MIPS-DTS-img-add-led-aliases.patch new file mode 100644 index 0000000000..949e86915c --- /dev/null +++ b/target/linux/pistachio/patches-5.4/903-MIPS-DTS-img-add-led-aliases.patch @@ -0,0 +1,27 @@ +--- a/arch/mips/boot/dts/img/pistachio_marduk.dts ++++ b/arch/mips/boot/dts/img/pistachio_marduk.dts +@@ -19,6 +19,11 @@ + ethernet0 = &enet; + spi0 = &spfi0; + spi1 = &spfi1; ++ ++ led-boot = &led_heartbeat; ++ led-failsafe = &led_heartbeat; ++ led-running = &led_heartbeat; ++ led-upgrade = &led_heartbeat; + }; + + chosen { +@@ -48,11 +53,10 @@ + + leds { + compatible = "pwm-leds"; +- heartbeat { ++ led_heartbeat: heartbeat { + label = "marduk:red:heartbeat"; + pwms = <&pwm 3 300000>; + max-brightness = <255>; +- linux,default-trigger = "heartbeat"; + }; + }; +