diff options
| author | David Bauer <mail@david-bauer.net> | 2019-01-17 00:43:12 +0100 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2019-01-26 17:10:19 +0100 |
| commit | 90bfbed7c2b2977776154010459cecb03b239ec0 (patch) | |
| tree | f54215e92c406c8ff127e68d6e5dd029f1ed06cf | |
| parent | b2e1333de3d47dede02fa6109063df6c0432e732 (diff) | |
| download | upstream-90bfbed7c2b2977776154010459cecb03b239ec0.tar.gz upstream-90bfbed7c2b2977776154010459cecb03b239ec0.tar.bz2 upstream-90bfbed7c2b2977776154010459cecb03b239ec0.zip | |
mpc85xx: use generic diag.sh
This commit removes the target-specific diag.sh script. This way, the
generic one is used for the target, which uses DT-aliases to specify the
LEDs used.
This way, we are also able to use different LEDs to indicate different
states. We use green status LEDs for indicating boot and a running
system. Where possible, the red status LED is used to indicate failsafe
mode and a running upgrade.
Signed-off-by: David Bauer <mail@david-bauer.net>
4 files changed, 23 insertions, 46 deletions
diff --git a/target/linux/mpc85xx/base-files/etc/diag.sh b/target/linux/mpc85xx/base-files/etc/diag.sh deleted file mode 100644 index e344d4b756..0000000000 --- a/target/linux/mpc85xx/base-files/etc/diag.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Copyright (C) 2013 OpenWrt.org - -. /lib/functions.sh -. /lib/functions/leds.sh - -get_status_led() { - case $(board_name) in - aerohive,hiveap-330) - status_led="hiveap-330:green:tricolor0" - ;; - sophos,red-15w-rev1) - status_led="red-15w-rev1:green:system" - ;; - tplink,tl-wdr4900-v1) - status_led="tp-link:blue:system" - ;; - esac -} - -set_state() { - get_status_led - - case "$1" in - preinit) - status_led_blink_preinit - ;; - - failsafe) - status_led_blink_failsafe - ;; - - preinit_regular) - status_led_blink_preinit_regular - ;; - - done) - status_led_on - ;; - esac -} diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts index 5e732664aa..c4abc905e9 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts @@ -14,6 +14,13 @@ model = "Aerohive HiveAP-330"; compatible = "aerohive,hiveap-330"; + aliases { + led-boot = &tricolor_green; + led-failsafe = &tricolor_red; + led-running = &tricolor_green; + led-upgrade = &tricolor_red; + }; + chosen { bootargs-override = "console=ttyS0,9600"; }; @@ -109,12 +116,12 @@ compatible = "national,lp5521"; reg = <0x32>; clock-mode = /bits/ 8 <2>; - chan0 { + tricolor_red: chan0 { chan-name = "hiveap-330:red:tricolor0"; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; }; - chan1 { + tricolor_green:chan1 { chan-name = "hiveap-330:green:tricolor0"; led-cur = /bits/ 8 <0x2f>; max-cur = /bits/ 8 <0x5f>; diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts index 600426bb6e..40b8014a53 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts @@ -6,6 +6,13 @@ model = "Sophos RED 15w Rev.1"; compatible = "sophos,red-15w-rev1"; + aliases { + led-boot = &system_green; + led-failsafe = &system_red; + led-running = &system_green; + led-upgrade = &system_red; + }; + memory { device_type = "memory"; }; @@ -13,12 +20,12 @@ leds { compatible = "gpio-leds"; - system_green { + system_green: system_green { gpios = <&gpio0 7 0>; label = "red-15w-rev1:green:system"; }; - system_red { + system_red: system_red { gpios = <&gpio0 3 0>; label = "red-15w-rev1:red:system"; }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts index 0969b272a8..ab4952aad5 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts @@ -24,6 +24,10 @@ aliases { spi0 = &spi0; + led-boot = &system_green; + led-failsafe = &system_green; + led-running = &system_green; + led-upgrade = &system_green; }; memory { @@ -192,7 +196,7 @@ leds { compatible = "gpio-leds"; - system { + system_green: system { gpios = <&gpio0 2 1>; /* active low */ label = "tp-link:blue:system"; }; |