pistachio: use generic diag.sh
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Thu, 20 Aug 2020 20:18:41 +0000 (22:18 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 21 Aug 2020 09:46:14 +0000 (11:46 +0200)
Remove local diag.sh in favor of generic one and add the required
led-* aliases to DTS.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
target/linux/pistachio/base-files/etc/diag.sh [deleted file]
target/linux/pistachio/patches-5.4/905-MIPS-DTS-img-marduk-Add-led-aliases.patch [new file with mode: 0644]

diff --git a/target/linux/pistachio/base-files/etc/diag.sh b/target/linux/pistachio/base-files/etc/diag.sh
deleted file mode 100755 (executable)
index ed69d43..0000000
+++ /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 (file)
index 0000000..c6cf5ac
--- /dev/null
@@ -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";
+               };
+       };