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>

diff --git a/target/linux/bcm63xx/base-files/etc/diag.sh b/target/linux/bcm63xx/base-files/etc/diag.sh
deleted file mode 100644 (file)
index 4b6d8d6..0000000
--- 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 2b25d009b326875045fa4e6bc91a25c3cd4c9ee2..0cde89f7af249181ac6d2f14dda23a40a5ea4a55 100644 (file)
--- 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 e47822af899da0720f2fddd2af9199b495ddf8b7..7f8cf1ae711d3927e034a7b9cbdaf0052227662f 100644 (file)
--- 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 d1085e7eedac3863e1c1d3e18a66f921155b5efa..c8e814526b78c9a39050f015470399be4ffe094e 100644 (file)
--- 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 cf5b296cb79368c96beb29cab92d298ed2ff777e..b22f5891cd84fe2fe63e68427d07a6e34163af23 100644 (file)
--- 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 f09310e2bb0bc8dd6c7f506ce5afbde86130700b..d4b0b31ef24deab59abeb94564cb2afe7df823e1 100644 (file)
--- 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 814274b61107010d88a1c9a19f1daa7193de6f5d..cc556372bf5722da9ceab91745536a06021f3174 100644 (file)
--- 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 e58f86558991159a5c9233c6578f46c5c92a731d..8c8b4566a3d839f6b90c8a94147e7d45852ad531 100644 (file)
--- 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 6fbac7d4619b2396eca17802d848d89226d73bd7..0e301425c63ac8ec83f765e5cef361c1f18fb862 100644 (file)
--- 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 a0a6c9ec54369d530cbb5abbb6378d532218b241..be02005a025c2f35206b586aa40f1772e38c39a4 100644 (file)
--- 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 e336024913f2f7cb4ef2e925f9af48b86dfd7af4..e8a5d79dd36759db92ea85095fc59c3dc5a9e622 100644 (file)
--- 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 209eda37f40330956defa6b0ad51d40f0a7aa7c6..e1199d2e664c77ac1bd025b8f22e3dafa2729a4b 100644 (file)
--- 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 f3fab050628764e9a63cf8aaf86a1d3da0dbfc00..25b833b0ec1bf1b9e4174ed2efaa007247c41452 100644 (file)
--- 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 5084bd8877f03dd30ebe4d3fdbc35a0b077f3d19..7bf0a64d18bf58ca80ab12dafb03b47029b967c6 100644 (file)
--- 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 d00d8fb4e56151d93ef6890063df651c70ca22d9..268aebf824c31fd8ca50e45b76987497cf420de0 100644 (file)
--- 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 36899a4cc0e65b1c46b54bc0c364bccad83a262f..0d2679c08cee405902747d8b1aeaa754b60525d7 100644 (file)
--- 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 f678762c86e674c2b00d949ed664620d5aec3b2f..877d321423e8df008a794a98ca00e2099164900b 100644 (file)
--- 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 ad0e7ce27df25016f615296bd74e00afb266e869..d9efff961f1ed637bec19d16696bf5fe87a4f791 100644 (file)
--- 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 bf7b4a3ec4888d8dd62906c9cf267ab74898b029..408afaa878e224f7882e084ef0afcfed8438899f 100644 (file)
--- 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 aeda3c2659fe57836af7de7e0450d43b7a90875d..47e0c8fb5c7feac26b7972e20a6d5b4320ab8814 100644 (file)
--- 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 61a0a3dd5cbf5bc35d061cf726e5a41a685091f3..fa9406859512a5a71809f208677767e1de64f65f 100644 (file)
--- 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 1eac7e3745b663e5ba970975f1bd36e1b8671ed9..6c2c24f2a4439009cc29727668f5acc8f3565d0c 100644 (file)
--- 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 ead9bc3a20e832eca4581e869e853181f6c045e6..f0486d19677a9c0f6f1301ab7a88d499d5adfcf9 100644 (file)
--- 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 4213822a3e756410edc5eb68d4d1b8f77c766454..8991a76e3e04d2303bf997a2e45496f366782b71 100644 (file)
--- 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 6e80675ff72f7575fa6426b25cb20a83a5e47197..70c955fdc7db84fcae212c90498ccf6b6a903fe2 100644 (file)
--- 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 8b0d1cacfd600d740c0a557d0a86ea0fe0240ff4..981e21ff2e6981692d49906162db0b81e9ae210f 100644 (file)
--- 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 c86cbf920378beb9d91e5bc394411d949140ec70..f98505920712b5c1d13b3cd70a1407c055110d8f 100644 (file)
--- 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 351b2945d3f60386a7ddc403e1ef68e07431d633..092e0704067ca5497ecb5dde08cc25cc5f427aad 100644 (file)
--- 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 6897378fe80fab865db25aaf3f13c0de06c04b64..b508a29f43ca30e244b558904e3b03f4242e93b3 100644 (file)
--- 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 d23066866ef9b5649f99c25df024681c25a62c67..c73981b47b28fa43fb0d24de0a0731f25ba38dda 100644 (file)
--- 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 1827e8e23572883a5ead064e068ba7d99290d774..25f771cd283b8a7b52e5d58697c8d22abfb39967 100644 (file)
--- 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 fa804bef9eaae9737c1cca7835493127632738ad..f608fa5709c097fa63fca2e9965af109176d0ae6 100644 (file)
--- 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 5ed847baab31eb36e2a9e9cd91258270ac3e7a03..afb18e666fa0bd05d93aa637d52a6d35a4fa0575 100644 (file)
--- 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 4aed5f0eb621b2b8527323d0571366407a5ff21e..28a515d2fb5004bd6d814f26988af779f98c9396 100644 (file)
--- 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 e4229122970feb7e19a587120e75c3e007ded7c6..9d7422145a056a7c2df56ade32f2d97e22e51818 100644 (file)
--- 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 5809b6da4ec426b6a42e029c3fa685d10c295eca..4aa805e5740b5443d001933c207f8770cb4684e2 100644 (file)
--- 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 db8ce7318f1af78c15ef356b8274d3721b58640d..84f7455f954e75b5c272906c245efe55e050e167 100644 (file)
--- 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 05198a1c9ab8dee1d752a89b90e25a6c5ff9bcf2..3b11ce30d93dc36ad95adddba072ca6928dab8bf 100644 (file)
--- 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 df9dc718e19c22f97cc7776104bc2f99138620fb..5b514796cfcc63e29b23a570d2cf780223cc5523 100644 (file)
--- 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 248ec1d73d5a9535dc3e172901d22377632adc7e..6083e8e9bb9f440b65f611731d44a9909985a6de 100644 (file)
--- 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 ac1f896434a1345be0576adadffa275751446704..1431cf5bd52f4ac12d93c60ada5678bf55677073 100644 (file)
--- 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 8048d131a28fa869c21beba4f3ff3e960f8d9576..3948195e2133aafbd067cf1fe389b821e3935ce2 100644 (file)
--- 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 3f855bf0c9a159c5a83c71596a43b8b3507739c7..0fcac83e7fd7a064214b010e2be6648d6cbc921b 100644 (file)
--- 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 0354d8eddd4101b67301928d2bdcc00c7a9e55fd..9f4040b96efa3739c6048ff44b3ca71203b1e669 100644 (file)
--- 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 48f35b16e7a4dbaaf8b9c48a6e140f6c3f4ad017..573bec743f204edb592a7a9ff25e0a9ab509d4ea 100644 (file)
--- 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 c123832803599650be7c5c31d7d8e56021b987a6..2edb802c6084b1d5b37fb9d7cb08b24019ec0283 100644 (file)
--- 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 c6db2721decb58502cdc28d3fd9949ff9bf5685d..e0e24c018241da27c4f29dbddb69edeea670df0b 100644 (file)
--- 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 93d4792740c74ed9232229bcac2f1602ef5afb16..902caa7f3a3d7a0a3758c07e3eaa3c9f338fc6ac 100644 (file)
--- 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";