From patchwork Thu Aug 20 20:18:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1348618 X-Patchwork-Delegate: hauke@hauke-m.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=NaclGMKB; 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 4BXbdS3dhYz9sR4 for ; Fri, 21 Aug 2020 06:21:16 +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=Rhrf2P71hZjVK419ZPnmpq0rCeECO4cEhwebZkasAmU=; b=NaclGMKB6NkYnM2RY1hax2+d8I cEhqja9hAejyv8pYzoYDB/gSKcqKeq/m6vNHIME/qYhPTE+/UNoYcwk0oAuYw1A5AOuIQhg1xEPvA mKAQPRuHxewEPXVnHwAm0+DX5L+0HFF9A6q0VeJbA6WmiSkPV3pRB9qv51obFc9HNg0+spcJ6Aaro KMtr0EpnACTZsQYZB54O+sSndY3XOjUsOH3V/+A8rfMKHrBxeE9VkzqY1ziNsqqctfvhIS3LBIqm9 cjCbSUo3Jm40cCBms8b1Q43JQgCuDigS6lodreG++xmnUekh2/Y5n29VT1bQr7LrZp7ceOxvhmL7d xhfltikA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8r27-00086l-Q8; Thu, 20 Aug 2020 20:19:35 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8r22-00085p-QI for openwrt-devel@lists.openwrt.org; Thu, 20 Aug 2020 20:19:32 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MdNHa-1khujV2OPY-00ZQ49 for ; Thu, 20 Aug 2020 22:19:25 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 2/2] pistachio: use generic diag.sh Date: Thu, 20 Aug 2020 22:18:41 +0200 Message-Id: <20200820201841.52946-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200820201841.52946-1-freifunk@adrianschmutzler.de> References: <20200820201841.52946-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:7npckTUs6cVcI5GTKvUrprm9FtnJDVzeMCcZN2CQsmxndpAQVi1 4T7IUzb6HHA6sb3/NVRtnO2I5icYfLnUJfiQ2cP/h00xlJ/bMrUrhWO7xIYWOGfkALABuCX XnV1tMC16g/TmwQYOi4PucSb5RHDb06Uiz88HwXqNNPcHQjhcZFXLT+t4Orp3BWniLDIFzQ xQiZWcZBBFtrQ3WK/aL2Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:8HmQ9VsoKXg=:QdCaL4tbwsWOjw10cZNTSN gf9fbkO4YHz6Sz9hXQPfgJB8bF0hvuscSwtdtcBDZJEpgqh65gz+L3h1pvsYEAPiOI9ojgCR9 mBtklz2yGOaAakjHcFLruNO0xYeUaAO+UetInUA7hDgOfzyGfaUjQAFzPaRrffBlk+WVuEJMj IdPW6BvcOCsuIV/ZLQ1hFAT22wMDyjqm831lLpX1lwXZBjU3RHLI2sUyKzuUdj5pzJHZn+XGD R5+cv6GmVI12wGfdIAO8g6PRS8KqZxQkr7PDj23+FrBxy1Zhv2wLTdU/46FYx3ieU8YpYX2Cn 3KsZDqp9Pj/+9pWyiC5G8/e68BPYRG9aD4pvwa5+mGa5Pna7kjcc/EQ3P0w7Gl1IlqiImTOZW l22RP5i92OX4HAXd7SzpGgzh2pSFiUB7phbT6KOyA3nPLPzRr1sDnT93bmJIe+iZ0mguKrnGR H53uypHvUeC6uJMvFFonbv4rYMtYRhL41+O+44syHZT8hKllkTqrqVMX4BsSBcIOcFAergOs/ CFIj3aitDIq9zvvLlEi6VLfJ6LWg77EidZovPtJqeYpxHZ+g2c7eA5oFZv7Ry7WOiayX98vnD 3ahQXWCC0WdM+0y14V83/zOzECxYLFqmzmzhgn6kthZcR9jivsgTVRpg/JXqKprCtUohHWaYc qHskCQsOj8bvZ/lBmW8bZf8OEn+rZB/ImoTjGgvCxISwvy2cHkiMu/exTGFgCXwbnFKqpR97r nHDv819E2/2MukZvTlPB/vI4keRVBbQJnEPUdzMvfXZKOJN2xUvudvjoTBVUKN6P3GIwyXw0e l/sdRX78vlX7PJRUFO0G3dU4JE//HzBDxg0KOOh9/85n4JSwPO1jYrJsG2QjClkOJjYr/hEws sTNw15PoXLG0NdufrhnA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200820_161931_062836_3DC98079 X-CRM114-Status: GOOD ( 13.58 ) 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 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.24 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.24 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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 the required led-* aliases to DTS. Signed-off-by: Adrian Schmutzler --- target/linux/pistachio/base-files/etc/diag.sh | 30 ------------------- ...-MIPS-DTS-img-marduk-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/905-MIPS-DTS-img-marduk-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/905-MIPS-DTS-img-marduk-Add-led-aliases.patch b/target/linux/pistachio/patches-5.4/905-MIPS-DTS-img-marduk-Add-led-aliases.patch new file mode 100644 index 0000000000..c6cf5acbb8 --- /dev/null +++ b/target/linux/pistachio/patches-5.4/905-MIPS-DTS-img-marduk-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 { +@@ -88,11 +93,10 @@ + + leds { + compatible = "pwm-leds"; +- heartbeat { ++ led_heartbeat: heartbeat { + label = "marduk:red:heartbeat"; + pwms = <&pwm 3 300000>; + max-brightness = <255>; +- linux,default-trigger = "heartbeat"; + }; + }; +