diff mbox series

[2/2] pistachio: use generic diag.sh

Message ID 20200816132227.1650-2-freifunk@adrianschmutzler.de
State Superseded
Delegated to: Adrian Schmutzler
Headers show
Series [1/2] pistachio: use vendor_model scheme for device/image name | expand

Commit Message

Adrian Schmutzler Aug. 16, 2020, 1:22 p.m. UTC 
Remove local diag.sh in favor of generic one and add led-* aliases
to DTS.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 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 mbox series

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";
+ 		};
+ 	};
+