diff options
7 files changed, 58 insertions, 75 deletions
diff --git a/target/linux/oxnas/base-files/etc/board.d/01_leds b/target/linux/oxnas/base-files/etc/board.d/01_leds deleted file mode 100755 index 0d92b16d96..0000000000 --- a/target/linux/oxnas/base-files/etc/board.d/01_leds +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -. /lib/functions/uci-defaults.sh - -board=$(board_name) -board_config_update - -case $board in - "akitio,myloud") - ucidef_set_led_default "status" "status" "akitio:red:status" "0" - ;; - "mitrastar,stg-212") - ucidef_set_led_default "power" "power" "zyxel:blue:status" "1" - ;; - "shuttle,kd20") - ucidef_set_led_default "power" "power" "kd20:blue:status" "1" - ;; - "cloudengines,pogoplug"*) - ucidef_set_led_default "power" "power" "pogoplug:blue:internal" "1" - ;; - -esac - -board_config_flush - -exit 0 diff --git a/target/linux/oxnas/base-files/etc/diag.sh b/target/linux/oxnas/base-files/etc/diag.sh deleted file mode 100644 index b8a51c2769..0000000000 --- a/target/linux/oxnas/base-files/etc/diag.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009-2013 OpenWrt.org - -. /lib/functions.sh -. /lib/functions/leds.sh - -get_status_led() { - case $(board_name) in - "akitio,mycloud") - status_led="akitio:red:status" - ;; - "mitrastar,stg-212") - status_led="zyxel:blue:status" - ;; - "shuttle,kd20") - status_led="kd20:blue:status" - ;; - "cloudengines,pogoplug"*) - status_led="pogoplug:blue:internal" - ;; - 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/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts index f0fa928f3d..e36bc6bd70 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts @@ -23,6 +23,10 @@ serial0 = &uart0; gpio0 = &gpio0; gpio1 = &gpio1; + led-boot = &led_status; + led-failsafe = &led_status; + led-running = &led_status; + led-upgrade = &led_status; }; i2c-gpio { @@ -62,7 +66,7 @@ compatible = "gpio-leds"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_leds>; - status { + led_status: status { label = "akitio:red:status"; gpios = <&gpio0 29 0>; }; diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts index 999276e5ad..19533930ef 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts @@ -28,24 +28,28 @@ serial0 = &uart0; gpio0 = &gpio0; gpio1 = &gpio1; + led-boot = &led_status; + led-failsafe = &led_warn; + led-running = &led_act; + led-upgrade = &led_warn; }; leds { compatible = "gpio-leds"; - blue { + led_status: blue { label = "pogoplug:blue"; gpios = <&gpio0 2 0>; default-state = "keep"; }; - orange { + led_warn: orange { label = "pogoplug:orange"; gpios = <&gpio1 16 1>; default-state = "keep"; }; - green { + led_act: green { label = "pogoplug:green"; gpios = <&gpio1 17 1>; default-state = "keep"; diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts index b3282acc72..4610aab883 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts @@ -23,6 +23,10 @@ serial0 = &uart0; gpio0 = &gpio0; gpio1 = &gpio1; + led-boot = &led_status; + led-failsafe = &led_warn; + led-running = &led_status; + led-upgrade = &led_warn; }; keys { @@ -45,11 +49,11 @@ leds { compatible = "gpio-leds"; - status { + led_status: status { label = "zyxel:blue:status"; gpios = <&gpio1 5 0>; }; - status2 { + led_warn: status2 { label = "zyxel:red:status"; gpios = <&gpio1 6 1>; }; diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts index 1984e446b2..40960d0f3d 100644 --- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts +++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts @@ -23,6 +23,10 @@ serial0 = &uart0; gpio0 = &gpio0; gpio1 = &gpio1; + led-boot = &led_status; + led-failsafe = &led_warn; + led-running = &led_status; + led-upgrade = &led_warn; }; i2c-gpio { @@ -67,11 +71,11 @@ leds { compatible = "gpio-leds"; - status { + led_status: status { label = "kd20:blue:status"; gpios = <&gpio1 16 0>; }; - status2 { + led_warn: status2 { label = "kd20:red:status"; gpios = <&gpio1 17 0>; }; diff --git a/target/linux/oxnas/patches-4.14/030-led-aliases-on-pogoplug-v3.patch b/target/linux/oxnas/patches-4.14/030-led-aliases-on-pogoplug-v3.patch new file mode 100644 index 0000000000..4025ec0353 --- /dev/null +++ b/target/linux/oxnas/patches-4.14/030-led-aliases-on-pogoplug-v3.patch @@ -0,0 +1,34 @@ +--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts ++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts +@@ -28,24 +28,28 @@ + serial0 = &uart0; + gpio0 = &gpio0; + gpio1 = &gpio1; ++ led-boot = &led_status; ++ led-failsafe = &led_warn; ++ led-running = &led_act; ++ led-upgrade = &led_warn; + }; + + leds { + compatible = "gpio-leds"; + +- blue { ++ led_status: blue { + label = "pogoplug:blue"; + gpios = <&gpio0 2 0>; + default-state = "keep"; + }; + +- orange { ++ led_warn: orange { + label = "pogoplug:orange"; + gpios = <&gpio1 16 1>; + default-state = "keep"; + }; + +- green { ++ led_act: green { + label = "pogoplug:green"; + gpios = <&gpio1 17 1>; + default-state = "keep"; |