ARM: dts: marvell: kirkwood: align LED node name with bindings

Bindings expect the LED node names to follow certain pattern, see
dtbs_check warnings:

  kirkwood-ds409slim.dtb: gpio-leds-alarm-12: 'hdd1-green' does not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts
index f34c3897ff48b84c7f00e7468b5cb724aa3d3069..36b90c632fd6275b04c188c1ed1521ff90f5397c 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts
@@ -51,7 +51,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               blue-power {
+               led-blue-power {
                        label = "nas220:blue:power";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "default-on";

diff --git a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts
index 92897f8b637bd80e9ad1df760d97b7a27f936a76..151edcd140a073d3b334a28a53a81735ee24c308 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts
@@ -69,11 +69,11 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               red-fail {
+               led-red-fail {
                        label = "cloudbox:red:fail";
                        gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                };
-               blue-sata {
+               led-blue-sata {
                        label = "cloudbox:blue:sata";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-d2net.dts b/arch/arm/boot/dts/marvell/kirkwood-d2net.dts
index bd3b266dd7660965a649173609bae7e2b2caa886..fcce8730d3e385516c03f727ec593e003d0bf7c3 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-d2net.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-d2net.dts
@@ -37,7 +37,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               red-fail {
+               led-red-fail {
                        label = "d2net_v2:red:fail";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts
index 1d1f4cdedab29b62bcb37df98710e1dde708cc95..2f6793f794cda6561f16062a45706901c6d57a11 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-dir665.dts
@@ -137,38 +137,38 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               blue-usb {
+               led-blue-usb {
                        label = "dir665:blue:usb";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
-               blue-internet {
+               led-blue-internet {
                        /* Can only be turned on if the Internet
                         * Ethernet port has Link
                         */
                        label = "dir665:blue:internet";
                        gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
                };
-               amber-internet {
+               led-amber-internet {
                        label = "dir665:amber:internet";
                        gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
                };
-               blue-wifi5g {
+               led-blue-wifi5g {
                        label = "dir665:blue:5g";
                        gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
                };
-               blue-status {
+               led-blue-status {
                        label = "dir665:blue:status";
                        gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
                };
-               blue-wps {
+               led-blue-wps {
                        label = "dir665:blue:wps";
                        gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
                };
-               amber-status {
+               led-amber-status {
                        label = "dir665:amber:status";
                        gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
                };
-               blue-24g {
+               led-blue-24g {
                        label = "dir665:blue:24g";
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-dns320.dts b/arch/arm/boot/dts/marvell/kirkwood-dns320.dts
index d6b0f418fd0183a9beec46bbec127e3b6c2e0b34..d8279e0c4c4f426d32484ff9388808a8921567c9 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-dns320.dts
@@ -24,24 +24,24 @@
                             &pmx_led_white_usb>;
                pinctrl-names = "default";
 
-               blue-power {
+               led-blue-power {
                        label = "dns320:blue:power";
                        gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
-               blue-usb {
+               led-blue-usb {
                        label = "dns320:blue:usb";
                        gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
                };
-               orange-l_hdd {
+               led-orange-l_hdd {
                        label = "dns320:orange:l_hdd";
                        gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
                };
-               orange-r_hdd {
+               led-orange-r_hdd {
                        label = "dns320:orange:r_hdd";
                        gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
                };
-               orange-usb {
+               led-orange-usb {
                        label = "dns320:orange:usb";
                        gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; /* GPIO 35 */
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-dns325.dts b/arch/arm/boot/dts/marvell/kirkwood-dns325.dts
index 94d9c06cbbf5cd81a915acea05556a678ec94751..7f396195e977ff65a5049150e9812646d665204e 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-dns325.dts
@@ -24,24 +24,24 @@
                             &pmx_led_white_usb>;
                pinctrl-names = "default";
 
-               white-power {
+               led-white-power {
                        label = "dns325:white:power";
                        gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
-               white-usb {
+               led-white-usb {
                        label = "dns325:white:usb";
                        gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */
                };
-               red-l_hdd {
+               led-red-l_hdd {
                        label = "dns325:red:l_hdd";
                        gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
                };
-               red-r_hdd {
+               led-red-r_hdd {
                        label = "dns325:red:r_hdd";
                        gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
                };
-               red-usb {
+               led-red-usb {
                        label = "dns325:red:usb";
                        gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts b/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts
index 264938dfa4d940a21a96f3c78a01f128dee051a1..090f1e2e5bb68c40cb88fc5efbb7a22890b3d3af 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-dockstar.dts
@@ -42,12 +42,12 @@
                pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
                pinctrl-names = "default";
 
-               health {
+               led-health {
                        label = "status:green:health";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
-               fault {
+               led-fault {
                        label = "status:orange:fault";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts b/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts
index 328516351e8477ae4f8132e1a306b4da001a8fdc..590bee3c561c45b6ae0b280c3ce912eaf07bcd52 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-dreamplug.dts
@@ -85,15 +85,15 @@
                             &pmx_led_wifi_ap >;
                pinctrl-names = "default";
 
-               bluetooth {
+               led-bluetooth {
                        label = "dreamplug:blue:bluetooth";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
-               wifi {
+               led-wifi {
                        label = "dreamplug:green:wifi";
                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
                };
-               wifi-ap {
+               led-wifi-ap {
                        label = "dreamplug:green:wifi_ap";
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts b/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts
index d4cb3cd3e2a2dc808f2344508f1f63c325d77519..d5ac4e3974da76693b8a67b0c590c974168fe7e6 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-goflexnet.dts
@@ -85,44 +85,44 @@
                            >;
                pinctrl-names = "default";
 
-               health {
+               led-health {
                        label = "status:green:health";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
-               fault {
+               led-fault {
                        label = "status:orange:fault";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
-               left0 {
+               led-left0 {
                        label = "status:white:left0";
                        gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
                };
-               left1 {
+               led-left1 {
                        label = "status:white:left1";
                        gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
                };
-               left2 {
+               led-left2 {
                        label = "status:white:left2";
                        gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
                };
-               left3 {
+               led-left3 {
                        label = "status:white:left3";
                        gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
                };
-               right0 {
+               led-right0 {
                        label = "status:white:right0";
                        gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
                };
-               right1 {
+               led-right1 {
                        label = "status:white:right1";
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                };
-               right2 {
+               led-right2 {
                        label = "status:white:right2";
                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                };
-               right3 {
+               led-right3 {
                        label = "status:white:right3";
                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts
index dfb41393941dbd81a2df0f60715edb9bb00b7613..d5aa8b505cc0aa816d12c64b5ab3d15c6a2b3008 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-guruplug-server-plus.dts
@@ -59,19 +59,19 @@
                              &pmx_led_wmode_r &pmx_led_wmode_g >;
                pinctrl-names = "default";
 
-               health-r {
+               led-health-r {
                        label = "guruplug:red:health";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };
-               health-g {
+               led-health-g {
                        label = "guruplug:green:health";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
-               wmode-r {
+               led-wmode-r {
                        label = "guruplug:red:wmode";
                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
                };
-               wmode-g {
+               led-wmode-g {
                        label = "guruplug:green:wmode";
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts
index 0f50eb2d59315a94341eb6868b619ad09b6b838f..018c6b8f3e8a8725a2528eb547210863528e44d7 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-ib62x0.dts
@@ -79,16 +79,16 @@
                             &pmx_led_usb_transfer>;
                pinctrl-names = "default";
 
-               green-os {
+               led-green-os {
                        label = "ib62x0:green:os";
                        gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
-               red-os {
+               led-red-os {
                        label = "ib62x0:red:os";
                        gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
                };
-               usb-copy {
+               led-usb-copy {
                        label = "ib62x0:red:usb_copy";
                        gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts
index a2782fe3d379de5a6d657d832a10dc462f823e8d..91b46e77e0b6ad12998cb7186c666e1c7f498ab6 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-iconnect.dts
@@ -89,32 +89,32 @@
                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
-               power-blue {
+               led-power-blue {
                        label = "power:blue";
                        gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
-               power-red {
+               led-power-red {
                        label = "power:red";
                        gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
                };
-               usb1 {
+               led-usb1 {
                        label = "usb1:blue";
                        gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
                };
-               usb2 {
+               led-usb2 {
                        label = "usb2:blue";
                        gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
                };
-               usb3 {
+               led-usb3 {
                        label = "usb3:blue";
                        gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
                };
-               usb4 {
+               led-usb4 {
                        label = "usb4:blue";
                        gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
                };
-               otb {
+               led-otb {
                        label = "otb:blue";
                        gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts
index 91409ae949c4d43ba0a33585febd670e2f4aa46c..039362152650e8b45b9e1a3668d50fa5bb04278b 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-iomega_ix2_200.dts
@@ -127,20 +127,20 @@
                              &pmx_led_rebuild &pmx_led_health >;
                pinctrl-names = "default";
 
-               power_led {
+               led-power-led {
                        label = "status:white:power_led";
                        gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
-               rebuild_led {
+               led-rebuild-led {
                        label = "status:white:rebuild_led";
                        gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
                };
-               health_led {
+               led-health-led {
                        label = "status:red:health_led";
                        gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
                };
-               backup_led {
+               led-backup-led {
                        label = "status:blue:backup_led";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts
index 094854743dded66af44a1156fe178ef3dd62e9f0..974bc9de47025770201d9d2f01f31047051f2edd 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-l-50.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-l-50.dts
@@ -97,52 +97,52 @@
        leds {
                compatible = "gpio-leds";
 
-               status_green {
+               led-status-green {
                        label = "l-50:green:status";
                        gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                };
 
-               status_red {
+               led-status-red {
                        label = "l-50:red:status";
                        gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;
                };
 
-               wifi {
+               led-wifi {
                        label = "l-50:green:wifi";
                        gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
-               internet_green {
+               led-internet-green {
                        label = "l-50:green:internet";
                        gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
                };
 
-               internet_red {
+               led-internet-red {
                        label = "l-50:red:internet";
                        gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                };
 
-               usb1_green {
+               led-usb1-green {
                        label = "l-50:green:usb1";
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port3>;
                };
 
-               usb1_red {
+               led-usb1-red {
                        label = "l-50:red:usb1";
                        gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
                };
 
-               usb2_green {
+               led-usb2-green {
                        label = "l-50:green:usb2";
                        gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port1>;
                };
 
-               usb2_red {
+               led-usb2-red {
                        label = "l-50:red:usb2";
                        gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts
index 8296486a5931f284248808d2d8fc0383b5e34100..90ea6cdee8e012ab243733c27d5109681729e2d9 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-laplug.dts
@@ -61,11 +61,11 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               red-fail {
+               led-red-fail {
                        label = "laplug_v2:red:power";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
-               blue-power {
+               led-blue-power {
                        label = "laplug_v2:blue:power";
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "default-on";

diff --git a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts
index ddefaf6285017a7a290ad0e34580885e2d213bd2..8a1c38ab611164c075ae2edc6e88d732273cd582 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-linksys-viper.dts
@@ -54,12 +54,12 @@
                pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
                pinctrl-names = "default";
 
-               white-health {
+               led-white-health {
                        label = "viper:white:health";
                        gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
                };
 
-               white-pulse {
+               led-white-pulse {
                        label = "viper:white:pulse";
                        gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
index c0f80146706db26352e6cd9c26b4c5250c74169c..5e0b139dd4fba8d526c98643c9ff87e3c96e95f0 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi
@@ -137,28 +137,28 @@
                             &pmx_led_function_blue>;
                pinctrl-names = "default";
 
-               func_blue {
+               led-func-blue {
                        label = "lsxl:blue:func";
                        gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
                };
 
-               alarm {
+               led-alarm {
                        label = "lsxl:red:alarm";
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };
 
-               info {
+               led-info {
                        label = "lsxl:amber:info";
                        gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                };
 
-               power {
+               led-power {
                        label = "lsxl:blue:power";
                        gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
-               func_red {
+               led-func-red {
                        label = "lsxl:red:func";
                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts b/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts
index e87ea71465462faff9b1d650ffa4d331e6553068..6533b49a15b283ddb4b83937b4e044a48c47736a 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-mplcec4.dts
@@ -114,36 +114,36 @@
                            >;
                pinctrl-names = "default";
 
-               health {
+               led-health {
                        label = "status:green:health";
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
-               user1o {
+               led-user1o {
                        label = "user1:orange";
                        gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               user1g {
+               led-user1g {
                        label = "user1:green";
                        gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               user0o {
+               led-user0o {
                        label = "user0:orange";
                        gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               user0g {
+               led-user0g {
                        label = "user0:green";
                        gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               misc {
+               led-misc {
                        label = "status:orange:misc";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";

diff --git a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts
index fd3813ace0c14747565db433e7388e55bb85fbbf..e3b41784c8762fc45b72adb5113c2b96b753caa5 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-mv88f6281gtw-ge.dts
@@ -73,17 +73,17 @@
                pinctrl-0 = <&pmx_leds &pmx_usb_led>;
                pinctrl-names = "default";
 
-               green-status {
+               led-green-status {
                        label = "gtw:green:Status";
                        gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
                };
 
-               red-status {
+               led-red-status {
                        label = "gtw:red:Status";
                        gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
                };
 
-               green-usb {
+               led-green-usb {
                        label = "gtw:green:USB";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
index 28f09f71b24dcf4b84a36c4fad236f30cdf7416b..d6b615cf6390665323bad7529fb0c0cc30219a2f 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-ns2-common.dtsi
@@ -66,7 +66,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               red-fail {
+               led-red-fail {
                        label = "ns2:red:fail";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts b/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts
index b0cb5907ed63f1b648bd24e4299084cc039cb10a..686bcd6f0f3c96183627ef364ce49167448dbfe3 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-ns2lite.dts
@@ -24,7 +24,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               blue-sata {
+               led-blue-sata {
                        label = "ns2:blue:sata";
                        gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "disk-activity";

diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts
index c1799a07816ef5852ca64ef027cd23533d966923..3555ac1c3b15cfc06c5690965b97389d267aa2c6 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310.dts
@@ -87,43 +87,43 @@
                             &pmx_led_hdd_green &pmx_led_hdd_red>;
                pinctrl-names = "default";
 
-               green-sys {
+               led-green-sys {
                        label = "nsa310:green:sys";
                        gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
                };
-               red-sys {
+               led-red-sys {
                        label = "nsa310:red:sys";
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
-               green-hdd {
+               led-green-hdd {
                        label = "nsa310:green:hdd";
                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
                };
-               red-hdd {
+               led-red-hdd {
                        label = "nsa310:red:hdd";
                        gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
                };
-               green-esata {
+               led-green-esata {
                        label = "nsa310:green:esata";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
-               red-esata {
+               led-red-esata {
                        label = "nsa310:red:esata";
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                };
-               green-usb {
+               led-green-usb {
                        label = "nsa310:green:usb";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };
-               red-usb {
+               led-red-usb {
                        label = "nsa310:red:usb";
                        gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                };
-               green-copy {
+               led-green-copy {
                        label = "nsa310:green:copy";
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                };
-               red-copy {
+               led-red-copy {
                        label = "nsa310:red:copy";
                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts
index b85e314f045a77916b50f9f87975a84774bfdedf..ddf84092aadeffe5ae2aa158da392d04c448eaa1 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-nsa310a.dts
@@ -75,39 +75,39 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               green-sys {
+               led-green-sys {
                        label = "nsa310:green:sys";
                        gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
                };
-               red-sys {
+               led-red-sys {
                        label = "nsa310:red:sys";
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
-               green-hdd {
+               led-green-hdd {
                        label = "nsa310:green:hdd";
                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
                };
-               red-hdd {
+               led-red-hdd {
                        label = "nsa310:red:hdd";
                        gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
                };
-               green-esata {
+               led-green-esata {
                        label = "nsa310:green:esata";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
-               red-esata {
+               led-red-esata {
                        label = "nsa310:red:esata";
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                };
-               green-usb {
+               led-green-usb {
                        label = "nsa310:green:usb";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };
-               green-copy {
+               led-green-copy {
                        label = "nsa310:green:copy";
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                };
-               red-copy {
+               led-red-copy {
                        label = "nsa310:red:copy";
                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts
index 652405e65006fc0840df81c71b2bdc8b97b70919..dd5c8ffc8781b5da59118409a8b72f2c9128ad1b 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-nsa320.dts
@@ -142,39 +142,39 @@
                             &pmx_led_hdd1_green &pmx_led_hdd1_red>;
                pinctrl-names = "default";
 
-               green-sys {
+               led-green-sys {
                        label = "nsa320:green:sys";
                        gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
                };
-               orange-sys {
+               led-orange-sys {
                        label = "nsa320:orange:sys";
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
-               green-hdd1 {
+               led-green-hdd1 {
                        label = "nsa320:green:hdd1";
                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
                };
-               red-hdd1 {
+               led-red-hdd1 {
                        label = "nsa320:red:hdd1";
                        gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
                };
-               green-hdd2 {
+               led-green-hdd2 {
                        label = "nsa320:green:hdd2";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
-               red-hdd2 {
+               led-red-hdd2 {
                        label = "nsa320:red:hdd2";
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                };
-               green-usb {
+               led-green-usb {
                        label = "nsa320:green:usb";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };
-               green-copy {
+               led-green-copy {
                        label = "nsa320:green:copy";
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                };
-               red-copy {
+               led-red-copy {
                        label = "nsa320:red:copy";
                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts b/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts
index 371456de34b272e65e99c650d8f7d6e3cf51ad1a..f0786a5f2ce6aed4f01fdfab5406203ef457d5a8 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-nsa325.dts
@@ -162,39 +162,39 @@
                             &pmx_led_hdd1_green &pmx_led_hdd1_red>;
                pinctrl-names = "default";
 
-               green-sys {
+               led-green-sys {
                        label = "nsa325:green:sys";
                        gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
                };
-               orange-sys {
+               led-orange-sys {
                        label = "nsa325:orange:sys";
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
-               green-hdd1 {
+               led-green-hdd1 {
                        label = "nsa325:green:hdd1";
                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
                };
-               red-hdd1 {
+               led-red-hdd1 {
                        label = "nsa325:red:hdd1";
                        gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
                };
-               green-hdd2 {
+               led-green-hdd2 {
                        label = "nsa325:green:hdd2";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
-               red-hdd2 {
+               led-red-hdd2 {
                        label = "nsa325:red:hdd2";
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                };
-               green-usb {
+               led-green-usb {
                        label = "nsa325:green:usb";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };
-               green-copy {
+               led-green-copy {
                        label = "nsa325:green:copy";
                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                };
-               red-copy {
+               led-red-copy {
                        label = "nsa325:red:copy";
                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts
index f9e95e55f36dd50b9e75bedd561e1b7da6d96a96..39a5345332da3c9f66fe1b7a2f828ff34e6ee12c 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-pogo_e02.dts
@@ -33,12 +33,12 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               health {
+               led-health {
                        label = "pogo_e02:green:health";
                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
-               fault {
+               led-fault {
                        label = "pogo_e02:orange:fault";
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts
index b66fc4d57410c38fa7282f32ca09bd8e9e5a8082..0e9c4cf79822e49b9d98ea5457b38f7f42c7ab9e 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-pogoplug-series-4.dts
@@ -46,12 +46,12 @@
                pinctrl-0 = <&pmx_led_green &pmx_led_red>;
                pinctrl-names = "default";
 
-               health {
+               led-health {
                        label = "pogoplugv4:green:health";
                        gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
-               fault {
+               led-fault {
                        label = "pogoplugv4:red:fault";
                        gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts
index ae8f493c9a0f3f9699b80879eba226044dcd1454..eb185273376ee67882e0795e005df970064be2a2 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug-esata.dts
@@ -33,7 +33,7 @@
                pinctrl-0 = <&pmx_led_blue>;
                pinctrl-names = "default";
 
-               health {
+               led-health {
                        label = "sheevaplug:blue:health";
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                        default-state = "keep";

diff --git a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts
index c73cc904e5c4b3f0ccb820703464c369aa8b54ae..ce73fcf2255f828cda931d9ba35a30ea83039b59 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts
+++ b/arch/arm/boot/dts/marvell/kirkwood-sheevaplug.dts
@@ -28,13 +28,13 @@
                pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
                pinctrl-names = "default";
 
-               health {
+               led-health {
                        label = "sheevaplug:blue:health";
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
-               misc {
+               led-misc {
                        label = "sheevaplug:red:misc";
                        gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };

diff --git a/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi b/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
index 20964eb48fd75a51640a30806e6a0c24abbda3c4..6b7c5218b1fb58dd83e68aa04228aaeba2431c35 100644 (file)
--- a/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/marvell/kirkwood-synology.dtsi
@@ -410,7 +410,7 @@
                pinctrl-0 = <&pmx_alarmled_12>;
                pinctrl-names = "default";
 
-               hdd1-green {
+               led-hdd1-green {
                        label = "synology:alarm";
                        gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
                };
@@ -424,42 +424,42 @@
                             &pmx_hddled_26 &pmx_hddled_27>;
                pinctrl-names = "default";
 
-               hdd1-green {
+               led-hdd1-green {
                        label = "synology:green:hdd1";
                        gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                };
 
-               hdd1-amber {
+               led-hdd1-amber {
                        label = "synology:amber:hdd1";
                        gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-green {
+               led-hdd2-green {
                        label = "synology:green:hdd2";
                        gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-amber {
+               led-hdd2-amber {
                        label = "synology:amber:hdd2";
                        gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
                };
 
-               hdd3-green {
+               led-hdd3-green {
                        label = "synology:green:hdd3";
                        gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
                };
 
-               hdd3-amber {
+               led-hdd3-amber {
                        label = "synology:amber:hdd3";
                        gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
                };
 
-               hdd4-green {
+               led-hdd4-green {
                        label = "synology:green:hdd4";
                        gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
                };
 
-               hdd4-amber {
+               led-hdd4-amber {
                        label = "synology:amber:hdd4";
                        gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
                };
@@ -471,12 +471,12 @@
                pinctrl-0 = <&pmx_hddled_21 &pmx_hddled_23>;
                pinctrl-names = "default";
 
-               hdd1-green {
+               led-hdd1-green {
                        label = "synology:green:hdd1";
                        gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
                };
 
-               hdd1-amber {
+               led-hdd1-amber {
                        label = "synology:amber:hdd1";
                        gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
                };
@@ -488,22 +488,22 @@
                pinctrl-0 = <&pmx_hddled_21 &pmx_hddled_23 &pmx_hddled_20 &pmx_hddled_22>;
                pinctrl-names = "default";
 
-               hdd1-green {
+               led-hdd1-green {
                        label = "synology:green:hdd1";
                        gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
                };
 
-               hdd1-amber {
+               led-hdd1-amber {
                        label = "synology:amber:hdd1";
                        gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-green {
+               led-hdd2-green {
                        label = "synology:green:hdd2";
                        gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-amber {
+               led-hdd2-amber {
                        label = "synology:amber:hdd2";
                        gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
                };
@@ -518,52 +518,52 @@
                             &pmx_hddled_45>;
                pinctrl-names = "default";
 
-               hdd1-green {
+               led-hdd1-green {
                        label = "synology:green:hdd1";
                        gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
                };
 
-               hdd1-amber {
+               led-hdd1-amber {
                        label = "synology:amber:hdd1";
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-green {
+               led-hdd2-green {
                        label = "synology:green:hdd2";
                        gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-amber {
+               led-hdd2-amber {
                        label = "synology:amber:hdd2";
                        gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
                };
 
-               hdd3-green {
+               led-hdd3-green {
                        label = "synology:green:hdd3";
                        gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
                };
 
-               hdd3-amber {
+               led-hdd3-amber {
                        label = "synology:amber:hdd3";
                        gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
                };
 
-               hdd4-green {
+               led-hdd4-green {
                        label = "synology:green:hdd4";
                        gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
                };
 
-               hdd4-amber {
+               led-hdd4-amber {
                        label = "synology:amber:hdd4";
                        gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
                };
 
-               hdd5-green {
+               led-hdd5-green {
                        label = "synology:green:hdd5";
                        gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
                };
 
-               hdd5-amber {
+               led-hdd5-amber {
                        label = "synology:amber:hdd5";
                        gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
                };
@@ -575,22 +575,22 @@
                pinctrl-0 = <&pmx_hddled_38 &pmx_hddled_39 &pmx_hddled_36 &pmx_hddled_37>;
                pinctrl-names = "default";
 
-               hdd1-green {
+               led-hdd1-green {
                        label = "synology:green:hdd1";
                        gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                };
 
-               hdd1-amber {
+               led-hdd1-amber {
                        label = "synology:amber:hdd1";
                        gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-green {
+               led-hdd2-green {
                        label = "synology:green:hdd2";
                        gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
                };
 
-               hdd2-amber {
+               led-hdd2-amber {
                        label = "synology:amber:hdd2";
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };