5 files changed, 49 insertions, 31 deletions
diff --git a/target/linux/apm821xx/base-files/etc/diag.sh b/target/linux/apm821xx/base-files/etc/diag.sh
index eb9b04b525..e45f2a8522 100755
--- a/target/linux/apm821xx/base-files/etc/diag.sh
+++ b/target/linux/apm821xx/base-files/etc/diag.sh
@@ -3,40 +3,42 @@
 . /lib/functions.sh
 . /lib/functions/leds.sh
 
-get_status_led() {
-	local board=$(board_name)
-
-	case $board in
-	mbl|\
-	mr24|\
-	mx60|\
-	wndr4700)
-		status_led="$board:green:power"
-		;;
-
-	*)
-		;;
-	esac
-}
+boot="$(get_dt_led boot)"
+failsafe="$(get_dt_led failsafe)"
+running="$(get_dt_led running)"
+upgrade="$(get_dt_led upgrade)"
 
 set_state() {
-	get_status_led
+	status_led="$boot"
 
 	case "$1" in
+	preinit_regular)
+		status_led_blink_preinit_regular
+		;;
 	preinit)
 		status_led_blink_preinit
 		;;
-
 	failsafe)
+		status_led_off
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_off
+		}
+		status_led="$failsafe"
 		status_led_blink_failsafe
 		;;
-
-	preinit_regular)
-		status_led_blink_preinit_regular
-		;;
-
+	upgrade)
+		[ -n "$running" ] && {
+			status_led="$upgrade"
+			status_led_blink_preinit_regular
+		}
+                ;;
 	done)
-		status_led_on
+		status_led_off
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_on
+		}
 		;;
 	esac
 }
diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts
index 8d20872c3f..75bb32255c 100644
--- a/target/linux/apm821xx/dts/MR24.dts
+++ b/target/linux/apm821xx/dts/MR24.dts
@@ -20,6 +20,10 @@
 
 	aliases {
 		serial0 = &UART1;
+		led-boot = &status;
+		led-failsafe = &failsafe;
+		led-running = &status;
+		led-upgrade = &status;
 	};
 
 	chosen {
@@ -91,12 +95,12 @@
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		power-green {
+		status: power-green {
 			label = "mr24:green:power";
 			gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
 		};
 
-		power-orange {
+		failsafe: power-orange {
 			label = "mr24:orange:power";
 			gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
 		};
diff --git a/target/linux/apm821xx/dts/MX60.dts b/target/linux/apm821xx/dts/MX60.dts
index 4ec0043f32..6c753639b2 100644
--- a/target/linux/apm821xx/dts/MX60.dts
+++ b/target/linux/apm821xx/dts/MX60.dts
@@ -20,6 +20,10 @@
 
 	aliases {
 		serial0 = &UART1;
+		led-boot = &status;
+		led-failsafe = &failsafe;
+		led-running = &status;
+		led-upgrade = &status;
 	};
 
 	chosen {
@@ -120,12 +124,12 @@
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		power-green {
+		status: power-green {
 			label = "mx60:green:power";
 			gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
 		};
 
-		power-orange {
+		failsafe: power-orange {
 			label = "mx60:orange:power";
 			gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
 		};
diff --git a/target/linux/apm821xx/dts/apollo3g.dtsi b/target/linux/apm821xx/dts/apollo3g.dtsi
index 783348a678..09a8b8518c 100644
--- a/target/linux/apm821xx/dts/apollo3g.dtsi
+++ b/target/linux/apm821xx/dts/apollo3g.dtsi
@@ -14,6 +14,10 @@
 
 	aliases {
 		serial0 = &UART0;
+		led-boot = &status;
+		led-failsafe = &status;
+		led-running = &status;
+		led-upgrade = &status;
 	};
 };
 
@@ -113,13 +117,13 @@
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		power-red {
+		failsafe: power-red {
 			label = "mbl:red:power";
 			gpios = <&GPIO1 4 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "panic";
 		};
 
-		power-green {
+		status: power-green {
 			label = "mbl:green:power";
 			gpios = <&GPIO1 5 GPIO_ACTIVE_HIGH>;
 		};
diff --git a/target/linux/apm821xx/dts/wndr4700.dts b/target/linux/apm821xx/dts/wndr4700.dts
index d1a65f3e62..2e0addf74b 100644
--- a/target/linux/apm821xx/dts/wndr4700.dts
+++ b/target/linux/apm821xx/dts/wndr4700.dts
@@ -19,6 +19,10 @@
 
 	aliases {
 		serial0 = &UART0;
+		led-boot = &status;
+		led-failsafe = &failsafe;
+		led-running = &status;
+		led-upgrade = &status;
 	};
 
 	chosen {
@@ -348,12 +352,12 @@
 
 	gpio-leds {
 		compatible = "gpio-leds";
-		power-green {
+		status: power-green {
 			label = "wndr4700:green:power";
 			gpios = <&GPIO0 8 GPIO_ACTIVE_HIGH>;
 		};
 
-		power-orange {
+		failsafe: power-orange {
 			label = "wndr4700:orange:power";
 			gpios = <&GPIO0 9 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "panic";