bcm63xx: 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.

Though generic diag.sh allows to use different LEDs to indicate different
states, this patch just moves the old assignment and does not try to
"improve" the assignment by using additional colors.
However, individual proposals to do so are welcome.

For the few cases where status_led2 was used in old diag.sh, only the
primary LED was migrated.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

48 files changed, 377 insertions, 216 deletions

diff --git a/target/linux/bcm63xx/base-files/etc/diag.sh b/target/linux/bcm63xx/base-files/etc/diag.sh
deleted file mode 100644
index 4b6d8d6065..0000000000
--- a/target/linux/bcm63xx/base-files/etc/diag.sh
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2007-2013 OpenWrt.org
-
-. /lib/functions.sh
-. /lib/functions/leds.sh
-
-set_state() {
-	case "$(board_name)" in
-	actiontec,r1000h)
-		status_led="R1000H:green:power"
-		;;
-	adb,a4001n)
-		status_led="A4001N:green:power"
-		;;
-	adb,a4001n1)
-		status_led="A4001N1:green:power"
-		;;
-	adb,av4202n)
-		status_led="AV4202N:white:power"
-		;;
-	asmax,ar-1004g)
-		status_led="AR1004G:green:power"
-		;;
-	brcm,bcm963281tan)
-		status_led="963281TAN::power"
-		;;
-	brcm,bcm96328avng)
-		status_led="96328avng::power"
-		;;
-	brcm,bcm96348gw)
-		status_led="96348GW:green:power"
-		;;
-	brcm,bcm96348gw-11)
-		status_led="96348GW-11:green:power"
-		;;
-	bt,home-hub-2-a)
-		status_led="HOMEHUB2A:green:upgrading"
-		status_led2="HOMEHUB2A:blue:upgrading"
-		;;
-	bt,voyager-2110)
-		status_led="V2110:power:green"
-		;;
-	comtrend,ar-5315u)
-		status_led="AR-5315u:green:power"
-		;;
-	comtrend,ar-5381u)
-		status_led="AR-5381u:green:power"
-		;;
-	comtrend,ar-5387un)
-		status_led="AR-5387un:green:power"
-		;;
-	comtrend,ct-536plus)
-		status_led="CT536_CT5621:green:power"
-		;;
-	comtrend,vr-3025u)
-		status_led="VR-3025u:green:power"
-		;;
-	comtrend,vr-3025un)
-		status_led="VR-3025un:green:power"
-		;;
-	comtrend,vr-3026e)
-		status_led="VR-3026e:green:power"
-		;;
-	comtrend,wap-5813n)
-		status_led="WAP-5813n:green:power"
-		;;
-	d-link,dsl-2640b-b)
-		status_led="D-4P-W:green:power"
-		;;
-	d-link,dsl-274xb-c2|\
-	d-link,dsl-274xb-f1)
-		status_led="dsl-274xb:green:power"
-		;;
-	d-link,dsl-275xb-d1)
-		status_led="dsl-275xb:green:power"
-		;;
-	dynalink,rta770bw)
-		status_led="RTA770BW:green:diag"
-		;;
-	dynalink,rta770w)
-		status_led="RTA770W:green:diag"
-		;;
-	huawei,echolife-hg520v)
-		status_led="HW520:green:net"
-		;;
-	huawei,echolife-hg553)
-		status_led="HW553:blue:power"
-		;;
-	huawei,echolife-hg556a-a|\
-	huawei,echolife-hg556a-b|\
-	huawei,echolife-hg556a-c)
-		status_led="HW556:red:power"
-		;;
-	huawei,echolife-hg655b)
-		status_led="HW65x:green:power"
-		;;
-	inventel,livebox-1)
-		status_led="Livebox1:red:adsl-fail-power"
-		;;
-	netgear,cvg834g)
-		status_led="CVG834G:green:power"
-		;;
-	netgear,dgnd3700-v1)
-		status_led="DGND3700v1_3800B:green:power"
-		;;
-	netgear,evg2000)
-		status_led="EVG2000:green:power"
-		;;
-	nucom,r5010un-v2)
-		status_led="R5010UNv2:green:power"
-		;;
-	observa,vh4032n)
-		status_led="VH4032N:blue:power"
-		;;
-	sagem,fast-2504n)
-		status_led="fast2504n:green:ok"
-		;;
-	sagem,fast-2704n)
-		status_led2="F@ST2704N:red:power"
-		;;
-	sagem,fast-2704-v2)
-		status_led="F@ST2704V2:green:power"
-		;;
-	sercomm,ad1018-nor)
-		status_led="AD1018:green:power"
-		;;
-	sky,sr102)
-		status_led="SR102:white:power"
-		status_led2="SR102:red:power"
-		;;
-	t-com,speedport-w-303v)
-		status_led="spw303v:green:power+adsl"
-		;;
-	t-com,speedport-w-500v)
-		status_led="SPW500V:green:power"
-		;;
-	tecom,gw6200)
-		status_led="GW6200:green:line1"
-		status_led2="GW6200:green:tel"
-		;;
-	telsey,cpva642)
-		status_led="CPVA642:green:power:"
-		;;
-	zyxel,p870hw-51a-v2)
-		status_led="P870HW-51a:green:power"
-		;;
-	esac
-
-	case "$1" in
-	preinit)
-		status_led_blink_preinit
-		;;
-	failsafe)
-		status_led_blink_failsafe
-		;;
-	preinit_regular)
-		status_led_blink_preinit_regular
-		;;
-	done)
-		if [ "${status_led/power}" != "$status_led" ]; then
-			status_led_on
-		else
-			status_led_off
-		fi
-		;;
-	esac
-}
diff --git a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
index 2b25d009b3..0cde89f7af 100644
--- a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
+++ b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
@@ -8,6 +8,13 @@
 	model = "Netgear CVG834G";
 	compatible = "netgear,cvg834g", "brcm,bcm3368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -16,7 +23,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "CVG834G:green:power";
 			gpios = <&gpio1 5 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
index e47822af89..7f8cf1ae71 100644
--- a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
+++ b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
@@ -8,6 +8,13 @@
 	model = "SKY SR102";
 	compatible = "sky,sr102", "brcm,bcm63168", "brcm,bcm63268";
 
+	aliases {
+		led-boot = &led_power_white;
+		led-failsafe = &led_power_white;
+		led-running = &led_power_white;
+		led-upgrade = &led_power_white;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -50,7 +57,7 @@
 			label = "SR102:white:inet";
 			gpios = <&pinctrl 5 0>;
 		};
-		power_white {
+		led_power_white: power_white {
 			label = "SR102:white:power";
 			gpios = <&pinctrl 6 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
index d1085e7eed..c8e814526b 100644
--- a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend AR-5315u";
 	compatible = "comtrend,ar-5315u", "brcm,bcm6318";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -41,7 +48,7 @@
 			label = "AR-5315u:green:wps";
 			gpios = <&pinctrl 0 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "AR-5315u:green:power";
 			gpios = <&pinctrl 1 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts
index cf5b296cb7..b22f5891cd 100644
--- a/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts
@@ -8,6 +8,13 @@
 	model = "D-Link DSL-2750B/DSL-2751 rev D1";
 	compatible = "d-link,dsl-275xb-d1", "brcm,bcm6318";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -44,7 +51,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "dsl-275xb:green:power";
 			gpios = <&pinctrl 3 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
index f09310e2bb..d4b0b31ef2 100644
--- a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
@@ -8,6 +8,13 @@
 	model = "Sagem F@st 2704N";
 	compatible = "sagem,fast-2704n", "brcm,bcm6318";
 
+	aliases {
+		led-boot = &led_power_red;
+		led-failsafe = &led_power_red;
+		led-running = &led_power_red;
+		led-upgrade = &led_power_red;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -76,7 +83,7 @@
 			label = "F@ST2704N:green:dsl";
 			gpios = <&pinctrl 10 1>;
 		};
-		power_red {
+		led_power_red: power_red {
 			label = "F@ST2704N:red:power";
 			gpios = <&pinctrl 11 1>;
 		};
diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
index 814274b611..cc556372bf 100644
--- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
@@ -8,6 +8,13 @@
 	model = "ADB P.DG A4001N";
 	compatible = "adb,a4001n", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -45,7 +52,7 @@
 			label = "A4001N:red:power";
 			gpios = <&pinctrl 4 0>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "A4001N:green:power";
 			gpios = <&pinctrl 8 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
index e58f865589..8c8b4566a3 100644
--- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
@@ -8,6 +8,13 @@
 	model = "ADB P.DG A4001N1";
 	compatible = "adb,a4001n1", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -45,7 +52,7 @@
 			label = "A4001N1:green:ppp";
 			gpios = <&pinctrl 3 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "A4001N1:green:power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts
index 6fbac7d461..0e301425c6 100644
--- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm963281tan.dts
@@ -8,6 +8,13 @@
 	model = "Broadcom bcm963281TAN reference board";
 	compatible = "brcm,bcm963281tan", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -20,7 +27,7 @@
 			label = "963281TAN::internet";
 			gpios = <&pinctrl 1 1>;
 		};
-		power {
+		led_power: power {
 			label = "963281TAN::power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts
index a0a6c9ec54..be02005a02 100644
--- a/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-brcm-bcm96328avng.dts
@@ -8,6 +8,13 @@
 	model = "Broadcom BCM96328avng reference board";
 	compatible = "brcm,bcm96328avng", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -24,7 +31,7 @@
 			label = "96328avng::dsl";
 			gpios = <&pinctrl 3 1>;
 		};
-		power {
+		led_power: power {
 			label = "96328avng::power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
index e336024913..e8a5d79dd3 100644
--- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend AR-5381u";
 	compatible = "comtrend,ar-5381u", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -38,7 +45,7 @@
 			label = "AR-5381u:green:inet";
 			gpios = <&pinctrl 3 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "AR-5381u:green:power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
index 209eda37f4..e1199d2e66 100644
--- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend AR-5387un";
 	compatible = "comtrend,ar-5387un", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -42,7 +49,7 @@
 			label = "AR-5387un:green:inet";
 			gpios = <&pinctrl 7 0>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "AR-5387un:green:power";
 			gpios = <&pinctrl 8 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts
index f3fab05062..25b833b0ec 100644
--- a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts
@@ -8,6 +8,13 @@
 	model = "D-Link DSL-2740B/DSL-2741B rev F1";
 	compatible = "d-link,dsl-274xb-f1", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -52,7 +59,7 @@
 			label = "dsl-274xb:green:dsl";
 			gpios = <&pinctrl 3 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "dsl-274xb:green:power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
index 5084bd8877..7bf0a64d18 100644
--- a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
@@ -8,12 +8,18 @@
 	model = "NuCom R5010UN v2";
 	compatible = "nucom,r5010un-v2", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
 	};
 
-
 	keys {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -50,7 +56,7 @@
 			label = "R5010UNv2:green:dsl";
 			gpios = <&pinctrl 3 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "R5010UNv2:green:power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
index d00d8fb4e5..268aebf824 100644
--- a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
@@ -8,6 +8,13 @@
 	model = "Sagem F@st 2704 V2";
 	compatible = "sagem,fast-2704-v2", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -56,7 +63,7 @@
 			label = "F@ST2704V2:green:dsl";
 			gpios = <&pinctrl 3 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "F@ST2704V2:green:power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
index 36899a4cc0..0d2679c08c 100644
--- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
@@ -8,6 +8,13 @@
 	model = "Sercomm AD1018 (SPI flash mod)";
 	compatible = "sercomm,ad1018-nor", "brcm,bcm6328";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -73,7 +80,7 @@
 		label = "AD1018:green:internet";
 	};
 
-	power_green@8 {
+	led_power_green: power_green@8 {
 		reg = <8>;
 		active-low;
 		label = "AD1018:green:power";
diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
index f678762c86..877d321423 100644
--- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
+++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
@@ -8,6 +8,13 @@
 	model = "Siemens Gigaset SE515";
 	compatible = "dynalink,rta770bw", "brcm,bcm6345";
 
+	aliases {
+		led-boot = &led_diag;
+		led-failsafe = &led_diag;
+		led-running = &led_diag;
+		led-upgrade = &led_diag;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -40,7 +47,7 @@
 			gpios = <&gpio0 8 0>;
 		};
 
-		diag {
+		led_diag: diag {
 			label = "RTA770BW:green:diag";
 			gpios = <&gpio0 10 1>;
 		};
diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
index ad0e7ce27d..d9efff961f 100644
--- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
+++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
@@ -8,6 +8,13 @@
 	model = "Dynalink RTA770W";
 	compatible = "dynalink,rta770w", "brcm,bcm6345";
 
+	aliases {
+		led-boot = &led_diag;
+		led-failsafe = &led_diag;
+		led-running = &led_diag;
+		led-upgrade = &led_diag;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -40,7 +47,7 @@
 			gpios = <&gpio0 8 0>;
 		};
 
-		diag {
+		led_diag: diag {
 			label = "RTA770W:green:diag";
 			gpios = <&gpio0 10 1>;
 		};
diff --git a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
index bf7b4a3ec4..408afaa878 100644
--- a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
@@ -8,6 +8,13 @@
 	model = "ASMAX AR 1004g";
 	compatible = "asmax,ar-1004g", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "AR1004G:green:power";
 			gpios = <&pinctrl 0 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
index aeda3c2659..47e0c8fb5c 100644
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
@@ -8,6 +8,13 @@
 	model = "Broadcom BCM96348GW-11 reference board";
 	compatible = "brcm,bcm96348gw-11", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "96348GW-11:green:power";
 			gpios = <&pinctrl 0 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
index 61a0a3dd5c..fa94068595 100644
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
@@ -8,6 +8,13 @@
 	model = "Broadcom BCM96348GW reference board";
 	compatible = "brcm,bcm96348gw", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "96348GW:green:power";
 			gpios = <&pinctrl 0 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts
index 1eac7e3745..6c2c24f2a4 100644
--- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts
@@ -8,6 +8,13 @@
 	model = "BT Voyager 2110";
 	compatible = "bt,voyager-2110", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "V2110:green:power";
 			gpios = <&pinctrl 0 1>;
 		};
diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
index ead9bc3a20..f0486d1967 100644
--- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend CT-536+/CT-5621T";
 	compatible = "comtrend,ct-536plus", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "CT536_CT5621:green:power";
 			gpios = <&pinctrl 0 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts
index 4213822a3e..8991a76e3e 100644
--- a/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-d-link-dsl-2640b-b.dts
@@ -8,6 +8,13 @@
 	model = "D-Link DSL-2640B rev B2";
 	compatible = "d-link,dsl-2640b-b", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "D-4P-W:green:power";
 			gpios = <&pinctrl 0 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts
index 6e80675ff7..70c955fdc7 100644
--- a/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-inventel-livebox-1.dts
@@ -8,6 +8,13 @@
 	model = "Inventel Livebox 1";
 	compatible = "inventel,livebox-1", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_red_adsl_fail;
+		led-failsafe = &led_red_adsl_fail;
+		led-running = &led_red_adsl_fail;
+		led-upgrade = &led_red_adsl_fail;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -37,7 +44,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		red_adsl_fail {
+		led_red_adsl_fail: red_adsl_fail {
 			label = "Livebox1:red:adsl-fail-power";
 			gpios = <&pinctrl 0 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
index 8b0d1cacfd..981e21ff2e 100644
--- a/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts
@@ -8,6 +8,13 @@
 	model = "T-Com Speedport W 500V";
 	compatible = "t-com,speedport-w-500v", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "SPW500V:green:power";
 			gpios = <&pinctrl 0 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts
index c86cbf9203..f985059207 100644
--- a/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-tecom-gw6200.dts
@@ -8,6 +8,13 @@
 	model = "TECOM GW6200";
 	compatible = "tecom,gw6200", "brcm,bcm6348";
 
+	aliases {
+		led-boot = &led_line1_green;
+		led-failsafe = &led_line1_green;
+		led-running = &led_line1_green;
+		led-upgrade = &led_line1_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		line1_green {
+		led_line1_green: line1_green {
 			label = "GW6200:green:line1";
 			gpios = <&pinctrl 4 1>;
 		};
diff --git a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts
index 351b2945d3..092e070406 100644
--- a/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-bt-home-hub-2-a.dts
@@ -8,6 +8,13 @@
 	model = "BT Home Hub 2.0 Type A";
 	compatible = "bt,home-hub-2-a", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_upgrading_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -54,7 +61,7 @@
 		label = "HOMEHUB2A:red:power";
 	};
 
-	led@1 {
+	led_power_green: led@1 {
 		reg = <0>;
 		active-low;
 		label = "HOMEHUB2A:green:power";
@@ -127,7 +134,7 @@
 		label = "HOMEHUB2A:red:upgrading";
 	};
 
-	led@13 {
+	led_upgrading_green: led@13 {
 		reg = <13>;
 		active-low;
 		label = "HOMEHUB2A:green:upgrading";
diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts
index 6897378fe8..b508a29f43 100644
--- a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-274xb-c2.dts
@@ -8,6 +8,13 @@
 	model = "D-Link DSL-2740B/DSL-2741B rev C2/3";
 	compatible = "d-link,dsl-274xb-c2", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -38,7 +45,7 @@
 			label = "dsl-274xb:red:power";
 			gpios = <&pinctrl 4 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "dsl-274xb:green:power";
 			gpios = <&pinctrl 5 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts
index d23066866e..c73981b47b 100644
--- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts
@@ -8,6 +8,13 @@
 	model = "Huawei EchoLife HG553";
 	compatible = "huawei,echolife-hg553", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_blue;
+		led-failsafe = &led_power_blue;
+		led-running = &led_power_blue;
+		led-upgrade = &led_power_blue;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -37,7 +44,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_blue: power_blue {
 			label = "HW553:blue:power";
 			gpios = <&pinctrl 4 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts
index 1827e8e235..25f771cd28 100644
--- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts
@@ -8,6 +8,13 @@
 	model = "Huawei EchoLife HG556a (version A)";
 	compatible = "huawei,echolife-hg556a-a", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_red;
+		led-failsafe = &led_power_red;
+		led-running = &led_power_red;
+		led-upgrade = &led_power_red;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -63,7 +70,7 @@
 			label = "HW556:red:dsl";
 			gpios = <&pinctrl 2 1>;
 		};
-		power_red {
+		led_power_red: power_red {
 			label = "HW556:red:power";
 			gpios = <&pinctrl 3 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts
index fa804bef9e..f608fa5709 100644
--- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts
@@ -8,6 +8,13 @@
 	model = "Huawei EchoLife HG556a (version B)";
 	compatible = "huawei,echolife-hg556a-b", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_red;
+		led-failsafe = &led_power_red;
+		led-running = &led_power_red;
+		led-upgrade = &led_power_red;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -63,7 +70,7 @@
 			label = "HW556:red:dsl";
 			gpios = <&pinctrl 2 1>;
 		};
-		power_red {
+		led_power_red: power_red {
 			label = "HW556:red:power";
 			gpios = <&pinctrl 3 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts
index 5ed847baab..afb18e666f 100644
--- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts
@@ -8,6 +8,13 @@
 	model = "Huawei EchoLife HG556a (version C)";
 	compatible = "huawei,echolife-hg556a-c", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_red;
+		led-failsafe = &led_power_red;
+		led-running = &led_power_red;
+		led-upgrade = &led_power_red;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -63,7 +70,7 @@
 			label = "HW556:red:dsl";
 			gpios = <&pinctrl 2 1>;
 		};
-		power_red {
+		led_power_red: power_red {
 			label = "HW556:red:power";
 			gpios = <&pinctrl 3 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
index 4aed5f0eb6..28a515d2fb 100644
--- a/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts
@@ -8,6 +8,13 @@
 	model = "T-Com Speedport W 303V";
 	compatible = "t-com,speedport-w-303v", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_adsl_green;
+		led-failsafe = &led_power_adsl_green;
+		led-running = &led_power_adsl_green;
+		led-upgrade = &led_power_adsl_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -49,7 +56,7 @@
 			label = "spw303v:green:ppp";
 			gpios = <&pinctrl 5 1>;
 		};
-		power_adsl_green {
+		led_power_adsl_green: power_adsl_green {
 			label = "spw303v:green:power+adsl";
 			gpios = <&pinctrl 22 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts
index e422912297..9d7422145a 100644
--- a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts
@@ -8,6 +8,13 @@
 	model = "Telsey CPVA642-type (CPA-ZNTE60T)";
 	compatible = "telsey,cpva642", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -65,7 +72,7 @@
 			label = "CPVA642:green:link";
 			gpios = <&pinctrl 10 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "CPVA642:green:power";
 			gpios = <&pinctrl 11 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts
index 5809b6da4e..4aa805e574 100644
--- a/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts
+++ b/target/linux/bcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts
@@ -8,6 +8,13 @@
 	model = "Huawei EchoLife HG520v";
 	compatible = "huawei,echolife-hg520v", "brcm,bcm6359", "brcm,bcm6358";
 
+	aliases {
+		led-boot = &led_inet_green;
+		led-failsafe = &led_inet_green;
+		led-running = &led_inet_green;
+		led-upgrade = &led_inet_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -30,7 +37,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		inet_green {
+		led_inet_green: inet_green {
 			label = "HW520:green:net";
 			gpios = <&pinctrl 32 1>;
 		};
diff --git a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts
index db8ce7318f..84f7455f95 100644
--- a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts
+++ b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts
@@ -8,6 +8,13 @@
 	model = "Sagem F@st 2504N";
 	compatible = "sagem,fast-2504n", "brcm,bcm6362";
 
+	aliases {
+		led-boot = &led_ok_green;
+		led-failsafe = &led_ok_green;
+		led-running = &led_ok_green;
+		led-upgrade = &led_ok_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -50,7 +57,7 @@
 			label = "fast2504n:red:internet";
 			gpios = <&pinctrl 26 1>;
 		};
-		ok_green {
+		led_ok_green: ok_green {
 			label = "fast2504n:green:ok";
 			gpios = <&pinctrl 28 1>;
 		};
diff --git a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts
index 05198a1c9a..3b11ce30d9 100644
--- a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts
@@ -8,6 +8,13 @@
 	model = "Actiontec R1000H";
 	compatible = "actiontec,r1000h", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -47,7 +54,7 @@
 			gpios = <&pinctrl 21 1>;
 		};
 
-		power_green {
+		led_power_green: power_green {
 			label = "R1000H:green:power";
 			gpios = <&pinctrl 22 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts
index df9dc718e1..5b514796cf 100644
--- a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts
@@ -9,6 +9,13 @@
 	model = "ADB P.DG AV4202N";
 	compatible = "adb,av4202n", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_white;
+		led-failsafe = &led_power_white;
+		led-running = &led_power_white;
+		led-upgrade = &led_power_white;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -38,7 +45,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_white {
+		led_power_white: power_white {
 			label = "AV4202N:white:power";
 			gpios = <&pinctrl 10 GPIO_ACTIVE_LOW>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
index 248ec1d73d..6083e8e9bb 100644
--- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend VR-3025u";
 	compatible = "comtrend,vr-3025u", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -38,7 +45,7 @@
 			label = "VR-3025u:green:inet";
 			gpios = <&pinctrl 5 0>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "VR-3025u:green:power";
 			gpios = <&pinctrl 22 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
index ac1f896434..1431cf5bd5 100644
--- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend VR-3025un";
 	compatible = "comtrend,vr-3025un", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -38,7 +45,7 @@
 			label = "VR-3025un:green:inet";
 			gpios = <&pinctrl 5 0>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "VR-3025un:green:power";
 			gpios = <&pinctrl 22 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
index 8048d131a2..3948195e21 100644
--- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend VR-3026e";
 	compatible = "comtrend,vr-3026e", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -38,7 +45,7 @@
 			label = "VR-3026e:green:inet";
 			gpios = <&pinctrl 5 0>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "VR-3026e:green:power";
 			gpios = <&pinctrl 22 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
index 3f855bf0c9..0fcac83e7f 100644
--- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
@@ -8,6 +8,13 @@
 	model = "Huawei EchoLife HG655b";
 	compatible = "huawei,echolife-hg655b", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -57,7 +64,7 @@
 			label = "HW65x:green:usb";
 			gpios = <&pinctrl 14 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "HW65x:green:power";
 			gpios = <&pinctrl 22 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
index 0354d8eddd..9f4040b96e 100644
--- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
@@ -8,6 +8,13 @@
 	model = "Netgear DGND3700v1/DGND3800B";
 	compatible = "netgear,dgnd3700-v1", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -76,7 +83,7 @@
 			label = "DGND3700v1_3800B:green:lan";
 			gpios = <&pinctrl 23 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "DGND3700v1_3800B:green:power";
 			gpios = <&pinctrl 24 1>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts
index 48f35b16e7..573bec743f 100644
--- a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts
@@ -8,6 +8,13 @@
 	model = "Observa VH4032N";
 	compatible = "observa,vh4032n", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_blue;
+		led-failsafe = &led_power_blue;
+		led-running = &led_power_blue;
+		led-upgrade = &led_power_blue;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -53,7 +60,7 @@
 			label = "VH4032N:red:hspa";
 			gpios = <&pinctrl 12 1>;
 		};
-		power_blue {
+		led_power_blue: power_blue {
 			label = "VH4032N:blue:power";
 			gpios = <&pinctrl 22 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts
index c123832803..2edb802c60 100644
--- a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts
@@ -8,6 +8,13 @@
 	model = "Zyxel P870HW-51a v2";
 	compatible = "zyxel,p870hw-51a-v2", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -37,7 +44,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		power_green {
+		led_power_green: power_green {
 			label = "P870HW-51a:green:power";
 			gpios = <&pinctrl 0 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts
index c6db2721de..e0e24c0182 100644
--- a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts
+++ b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts
@@ -8,6 +8,13 @@
 	model = "Comtrend WAP-5813n";
 	compatible = "comtrend,wap-5813n", "brcm,bcm6369", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -48,7 +55,7 @@
 			label = "WAP-5813n:green:inet";
 			gpios = <&pinctrl 5 0>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "WAP-5813n:green:power";
 			gpios = <&pinctrl 22 0>;
 			default-state = "on";
diff --git a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts
index 93d4792740..902caa7f3a 100644
--- a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts
+++ b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts
@@ -8,6 +8,13 @@
 	model = "Netgear EVG2000";
 	compatible = "netgear,evg2000", "brcm,bcm6369", "brcm,bcm6368";
 
+	aliases {
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
+	};
+
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 		stdout-path = "serial0:115200n8";
@@ -57,7 +64,7 @@
 			label = "EVG2000:green:usb";
 			gpios = <&pinctrl 15 1>;
 		};
-		power_green {
+		led_power_green: power_green {
 			label = "EVG2000:green:power";
 			gpios = <&pinctrl 22 1>;
 			default-state = "on";