bcm63xx: convert to new LED color/function format where possible

Initial conversion to new LED color/function format
and drop label format where possible. The same label
is composed at runtime.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
index fb22f769d69a16ff5b87ec04e7289432f315f120..998ca6002a86438e5fda84f666b519ec9ed0985f 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
+++ b/target/linux/bcm63xx/dts/bcm3368-netgear-cvg834g.dts
@@ -1,6 +1,7 @@
 #include "bcm3368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear CVG834G";
@@ -22,7 +23,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 5 0>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s.dtsi b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s.dtsi
index 07665007344673be543673e0258c42b22cb35e57..af633cadebf779cc3f7fe0396bdaf15f3fe8f4c5 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s.dtsi
+++ b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s.dtsi
@@ -8,6 +8,7 @@
 #include "bcm63268.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -62,7 +63,8 @@
 
        led_power_red: power_red {
                reg = <8>;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        wifi_green {
@@ -97,7 +99,8 @@
 
        led_power_green: power_green {
                reg = <17>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 

diff --git a/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts b/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts
index c2505f86ba752413bf13b42ebdbf6f2f3ba449a1..6627d67f8c0f685f7abedd60a1602d28caddae2f 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts
+++ b/target/linux/bcm63xx/dts/bcm63168-comtrend-vr-3032u.dts
@@ -3,6 +3,7 @@
 #include "bcm63268.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend VR-3032u";
@@ -80,13 +81,15 @@
        led@4 {
                reg = <4>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@7 {
                reg = <7>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@8 {
@@ -140,7 +143,8 @@
        led_power_green: led@20 {
                reg = <20>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 };

diff --git a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
index 47ba15608e61abf4dd5bcf36fdd26a7f623744c1..4be787d09316be27593d2e9be337e0a44121a6da 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
+++ b/target/linux/bcm63xx/dts/bcm63168-sky-sr102.dts
@@ -1,6 +1,7 @@
 #include "bcm63268.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "SKY SR102";
@@ -40,7 +41,8 @@
                        gpios = <&pinctrl 1 1>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 2 1>;
                };
                wifi_red {
@@ -56,7 +58,8 @@
                        gpios = <&pinctrl 5 0>;
                };
                led_power_white: power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&pinctrl 6 0>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts b/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts
index 5d5ba46e3c777afc3c11515e76c83414ccd69dd5..373480b0130d1d30fb4429e2870b8b7d137f3086 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts
+++ b/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts
@@ -3,6 +3,7 @@
 #include "bcm63268.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend VG-8050";
@@ -60,20 +61,23 @@
        led@3 {
                reg = <3>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led_power_green: led@6 {
                reg = <6>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
        led@7 {
                reg = <7>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@8 {
@@ -97,7 +101,8 @@
        led@14 {
                reg = <14>;
                active-low;
-               label = "red:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_RED>;
        };
 };
 

diff --git a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
index 8557730c8cd3b53fe01e237d494ab4c31d8a4fa5..a3a7d1a3c56d6072e91c9f5bc6ba219df433e153 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-comtrend-ar-5315u.dts
@@ -1,6 +1,7 @@
 #include "bcm6318.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend AR-5315u";
@@ -89,20 +90,23 @@
        led@0 {
                reg = <0>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led_power_green: led@1 {
                reg = <1>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
        led@2 {
                reg = <2>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@4 {
@@ -154,7 +158,8 @@
        led@11 {
                reg = <11>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 };
 

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 acf4332a66ff7d4fe41e1402220007c2f13011a2..31d05b96ae63203e3f9b332a0c2f2acf4bb3b59a 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
@@ -1,6 +1,7 @@
 #include "bcm6318.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "D-Link DSL-2750B/DSL-2751 rev D1";
@@ -50,7 +51,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 3 1>;
                        default-state = "on";
                };
@@ -71,7 +73,8 @@
                };
 
                wps_blue {
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pinctrl 16 1>;
                };
 
@@ -82,7 +85,8 @@
 
                usb_green {
                        /* not user controllable? */
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 49 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
index 6702ef16564b9c4a41e2071311bafc1d6412c93c..4d928f215538498c167fa5bf342715e378bfe69f 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
+++ b/target/linux/bcm63xx/dts/bcm6318-sagem-fast-2704n.dts
@@ -1,6 +1,7 @@
 #include "bcm6318.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Sagem F@st 2704N";
@@ -50,7 +51,8 @@
                compatible = "gpio-leds";
 
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 2 1>;
                };
                lan1_green {
@@ -82,16 +84,19 @@
                        gpios = <&pinctrl 10 1>;
                };
                led_power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 11 1>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 47 1>;
                        default-state = "on";
                };
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 49 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
index 641de68d356d9e5dc837609f6bf2ed3a3ea59c85..790320a206f0558c57ddceb06a9c61b8057f4281 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n.dts
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "ADB P.DG A4001N";
@@ -47,16 +48,19 @@
                        gpios = <&pinctrl 1 0>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 4 0>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 8 0>;
                        default-state = "on";
                };
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 10 1>;
                };
                dsl_green {

diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
index bd05547bae99667edeaac8c227549d1801a151fb..f23716bd4d73042d7786f4580a4cb2242c029bc3 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-a4001n1.dts
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "ADB P.DG A4001N1";
@@ -51,7 +52,8 @@
                        gpios = <&pinctrl 3 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
@@ -68,15 +70,18 @@
                        gpios = <&pinctrl 7 1>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 8 1>;
                };
                wlan_green {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 9 1>;
                };
                wlan_red {
-                       label = "red:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 10 1>;
                };
                inet_green {

diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts
index f42b970c4670e179ceb7388fdc8d2ad041184cfa..b2f3ddfc401ddfbbe0e3d3c0981288f1dc17f86c 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4001n-a-000-1a1-ax.dts
@@ -3,6 +3,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "ADB P.DG A4001N A-000-1A1-AX";
@@ -81,7 +82,8 @@
        led@8 {
                reg = <8>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@9 {
@@ -105,7 +107,8 @@
        led_power_green: led@12 {
                reg = <12>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 };

diff --git a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts
index 7ffff4e223470ddc2cca8ce9c254997f0a217457..16c9af574716e9f00093221b7a4b2f2f1d6b545a 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-adb-pdg-a4101n-a-000-1a1-ae.dts
@@ -3,6 +3,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "ADB P.DG A4101N A-000-1A1-AE";
@@ -72,13 +73,15 @@
        led@9 {
                reg = <9>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@10 {
                reg = <10>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@11 {

diff --git a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
index 5878e886d2e6992d94e077e2f9298cff2ee966fc..7e196e5e68307ffb341efb9054b05d633a9d7cf4 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5381u.dts
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend AR-5381u";
@@ -80,7 +81,8 @@
        led_alarm_red: led@2 {
                reg = <2>;
                active-low;
-               label = "red:alarm";
+               function = LED_FUNCTION_ALARM;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@3 {
@@ -92,7 +94,8 @@
        led_power_green: led@4 {
                reg = <4>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                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 a703fd6629853a10513962fad695f53ed1dd80f7..a0f5691fb500b7c616741a4b4e6eca0e785656b5 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-comtrend-ar-5387un.dts
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend AR-5387un";
@@ -84,7 +85,8 @@
 
        led@4 {
                reg = <4>;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@7 {
@@ -94,7 +96,8 @@
 
        led_power_green: led@8 {
                reg = <8>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                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 660a4d570ce5babf522d3bbb321f61ccaab9bb70..f320be4aca8060b33bbcacc59546cc3d5647469f 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
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "D-Link DSL-2740B/DSL-2741B rev F1";
@@ -58,16 +59,19 @@
                        gpios = <&pinctrl 3 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 8 1>;
                };
                wps_blue {
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pinctrl 9 1>;
                };
                inet_green {

diff --git a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts
index 09152150392a9da5a05e11f15b39cc1eac6abd47..cdbb5c2c5b2a3afda61957c3c7c43355c8b5ce0c 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-d-link-dsl-2750u-c1.dts
@@ -3,6 +3,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "D-Link DSL-2750U rev C1";
@@ -97,7 +98,8 @@
        led_power_green: led@4 {
                reg = <4>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
@@ -110,19 +112,22 @@
        led@8 {
                reg = <8>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@9 {
                reg = <9>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@10 {
                reg = <10>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@11 {

diff --git a/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts b/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts
index dd8ab129586a7addc10c6ca757173d648013b4f5..afedfe24508b26e520152327207ca657704066c7 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-innacomm-w3400v6.dts
@@ -3,6 +3,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Innacomm W3400V6";
@@ -88,20 +89,23 @@
        led_power_green: led@4 {
                reg = <4>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
        led_power_red: led@5 {
                reg = <5>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@11 {
                reg = <11>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 };
 

diff --git a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
index 08f3736a7b5cdce381c6306e00936a29351be9e9..e71e1436b52d455acb95420619119b0ffd057a4a 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-nucom-r5010un-v2.dts
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "NuCom R5010UN v2";
@@ -55,7 +56,8 @@
                        gpios = <&pinctrl 3 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
@@ -64,11 +66,13 @@
                        gpios = <&pinctrl 5 1>;
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 10 1>;
                };
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 11 1>;
                };
        };

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 ff9b23049bcf4cd9b22b209ac6cd50f41864a4d1..06f314ca79da7a5548bffc950f93a37883e4de75 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Sagem F@st 2704 V2";
@@ -50,7 +51,8 @@
                compatible = "gpio-leds";
 
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 1 1>;
                };
                inet_red {
@@ -62,16 +64,19 @@
                        gpios = <&pinctrl 3 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 5 1>;
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 10 1>;
                };
                inet_green {

diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
index 5a9f52648e295eda93b572a088eeeff002fa450f..1dda9d64f349d25da3bd8e860409c486f71c3aab 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018-nor.dts
@@ -1,6 +1,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Sercomm AD1018 (SPI flash mod)";
@@ -81,7 +82,8 @@
        led_power_green: power_green@8 {
                reg = <8>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
@@ -106,7 +108,8 @@
        wps_green@13 {
                reg = <13>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        wifi_green@14 {
@@ -118,7 +121,8 @@
        usb_green@15 {
                reg = <15>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        ephy0_spd@17 {

diff --git a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
index edb1ce49a68cf244d3cffdc842f06da4e04d035e..edd1d8c348a66fc6e7a6787abc29b387846ac024 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-sercomm-ad1018.dts
@@ -3,6 +3,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Sercomm AD1018";
@@ -76,7 +77,8 @@
        led_power_green: led@8 {
                reg = <8>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
@@ -101,7 +103,8 @@
        led@13 {
                reg = <13>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@14 {
@@ -113,7 +116,8 @@
        led@15 {
                reg = <15>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@17 {

diff --git a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts
index 0dfa38e474c43656ae84593302d6b114bbbc72bb..d88855f7a5a48d486713e1993942068c68d1e737 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n-telecom-italia.dts
@@ -3,6 +3,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Technicolor TG582n Telecom Italia";
@@ -57,7 +58,8 @@
        led_power_green: led@4 {
                reg = <4>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
@@ -76,7 +78,8 @@
        led@8 {
                reg = <8>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@11 {

diff --git a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts
index 6ec20048cda6869975ef9bd50b00c121f7c2ae72..0bd7b72b3c775f5b651b05738676296e10638930 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts
+++ b/target/linux/bcm63xx/dts/bcm6328-technicolor-tg582n.dts
@@ -3,6 +3,7 @@
 #include "bcm6328.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Technicolor TG582n";
@@ -76,7 +77,8 @@
        led_power_green: led@4 {
                reg = <4>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
@@ -95,19 +97,22 @@
        led@8 {
                reg = <8>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@9 {
                reg = <9>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@10 {
                reg = <10>;
                active-low;
-               label = "red:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led@11 {

diff --git a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts
index 885654ad41d4bfc4046a85fb91cac2a4622e5f4d..882e376d5bae490d0c48e32e43269d53d8654494 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338gw.dts
@@ -1,6 +1,7 @@
 #include "bcm6338.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96338GW reference board";
@@ -15,7 +16,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts
index 3002a9240ba2a8f123c37487f816ed7809e1282f..4165ddc325471843437a9a8e7730c4529093f0ce 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-brcm-bcm96338w.dts
@@ -1,6 +1,7 @@
 #include "bcm6338.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96338W reference board";
@@ -15,7 +16,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts
index dae5324f0aa98c38552fac42529d536a56dfd941..c463eaa4fac4fdae68c6de59c5dd73df97915a2c 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-d-link-dsl-2640u.dts
@@ -1,6 +1,7 @@
 #include "bcm6338.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "D-Link DSL-2640U/BRU/C";
@@ -15,7 +16,8 @@
                compatible = "gpio-leds";
 
                green_power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts
index 7d3f4a598f64e2a4422ba459a7a366b797ae827d..7148727b1deab74b92181767ce050205ed4ef4f2 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts
+++ b/target/linux/bcm63xx/dts/bcm6338-dynalink-rta1320.dts
@@ -1,6 +1,7 @@
 #include "bcm6338.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Dynalink RTA1320";
@@ -15,7 +16,8 @@
                compatible = "gpio-leds";
 
                green_power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
index e5b67291b18b4a234e1daba4d3f7ed43b877ecd5..0e4b91333e8767fd2e555bc69980fb23f7d7e7d3 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
+++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770bw.dts
@@ -1,6 +1,7 @@
 #include "bcm6345.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Siemens Gigaset SE515";
@@ -36,7 +37,8 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 7 1>;
                };
 
@@ -51,7 +53,8 @@
                };
 
                wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 11 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
index 65fb1d7b1ef57993155db53a019d035f524007b5..4ca9f51aa758ab1a03eaa8586562dec04910a8f2 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
+++ b/target/linux/bcm63xx/dts/bcm6345-dynalink-rta770w.dts
@@ -1,6 +1,7 @@
 #include "bcm6345.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Dynalink RTA770W";
@@ -36,7 +37,8 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 7 1>;
                };
 
@@ -51,7 +53,8 @@
                };
 
                wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 11 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
index 6ffa3b457d3139d33401cf9dddac56b2310aa159..43cdb2da92c11254195d116fd25d8f5a877e3b90 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-asmax-ar-1004g.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "ASMAX AR 1004g";
@@ -36,7 +37,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
@@ -45,7 +47,8 @@
                        gpios = <&pinctrl 3 1>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 6 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts
index 620d6510b6472ddc1cbe672573777b601383a759..7686c3deb4994d83cbb3eedb482e8e14a36c2350 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-belkin-f5d7633.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Belkin F5D7633";
@@ -29,7 +30,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts
index 8e19d7a261b1d83f019b746ef8f7f9bddb5c0b0c..d683ac1f09d6cfc211d1a002a7aea58444ec61ca 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-10.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96348GW-10 reference board";
@@ -29,7 +30,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        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 cf983b446b78780f4ea6f5394717a365712cbc01..09378dd5147f11f8c5203c0af161e73cea4e61a2 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw-11.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96348GW-11 reference board";
@@ -36,7 +37,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        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 9eeb50625d3411fcda52ad1dba004ef20fa61789..ea1eded5688f4fc2e6e10016c2e1c1b92b84e2c0 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348gw.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96348GW reference board";
@@ -36,7 +37,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts
index 2b5440456017ba6c6e6b641cd7497e95c046ac0d..ff678dc0563caf429b3564e2dc884fc77e808d4b 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-brcm-bcm96348r.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom 96348R reference board";
@@ -15,7 +16,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        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 39aa48971de46eb2375ffbbc2b881878011ee27d..d80ed9a943be9bceb019a6ad305c786e919c5fcb 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2110.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "BT Voyager 2110";
@@ -36,11 +37,13 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 1 1>;
                };
                adsl_green {

diff --git a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
index 5e399a05a57ca0b53cbd628686955fd3aa012e4c..bc8616ada1c4831405b4988a3a9675ec8c1221a2 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "BT Voyager 2500V";
@@ -29,11 +30,13 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 1 1>;
                };
                adsl_green {

diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts
index 308139b0ce068fd423cb4893483d6f3a69a39979..4eef3139b74951695d20e9535c7879d600f5d8c6 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-5365.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend CT-5365";
@@ -43,16 +44,19 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                alarm_red {
-                       label = "red:alarm";
+                       function = LED_FUNCTION_ALARM;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 2 1>;
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 6 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
index e95e4e6e4f43969d6db146a688ef84bd8b12aa3d..2460ccb10c34a33a04b972d38be193344dbdd6be 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-comtrend-ct-536plus.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend CT-536+/CT-5621T";
@@ -36,7 +37,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        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 d71bc4e56a61dcd8072fa4c5b26193e4b70d9a74..f50992b02b6a7a0485e9c389da6e56108849111f 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
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "D-Link DSL-2640B rev B2";
@@ -36,7 +37,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts
index e91a4105dbe3f54a20a7bc368e07ff43b07c3336..318f12b66ca2bd3e0d518f9525e3df8df4fdcb37 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834g-v4.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear DG834G v4";
@@ -29,12 +30,14 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                status {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 1 1>;
                };
                inet_green {

diff --git a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts
index 3f17f987dadeef0911eb190f5d48b67c72bd8051..eb20d4b6c8af6a9d8cd89dc11986db611d38d22c 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear DG834GT/PN";
@@ -29,7 +30,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts
index 987903d525e934832ff308dc43823f16590fe720..4a1862b71f0040ddd6c88662518d09ef9b4f84fb 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-sagem-fast-2604.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Sagem F@st 2604";
@@ -29,12 +30,14 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 1 1>;
                };
                inet_red {
@@ -42,7 +45,8 @@
                        gpios = <&pinctrl 4 1>;
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 5 1>;
                };
        };

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 c096b88d8fc5a40f2abcb3ab025ce1d92768f71c..29cc3fa64438e94d38d9d31a707a1f993315c6dd 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
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "T-Com Speedport W 500V";
@@ -36,12 +37,14 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 1 1>;
                };
                ppp_green {

diff --git a/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts b/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts
index 00ce70f17bae417b4e94a942bb9470c38ecb6f0a..c9d9989168c4f16fb5df00210986a1f78869ced2 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-telsey-magic.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Alice W-Gate";
@@ -15,7 +16,8 @@
                compatible = "gpio-leds";
 
                power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };
@@ -46,7 +48,8 @@
                };
 
                usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 35 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts b/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts
index 1a49e7ff33718594eef89ef63696d733601e0207..6e1f7155d95d56e083a82e361b8fa9da07dbf253 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts
+++ b/target/linux/bcm63xx/dts/bcm6348-tp-link-td-w8900gb.dts
@@ -1,6 +1,7 @@
 #include "bcm6348.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "TP-Link TD-W8900GB";
@@ -29,7 +30,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts b/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts
index fdc1edf9069297a9a2289a920f2ba150677a5459..0b5abbd1f69ac7e71031fe09b87b7fb7ccbc10db 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-alcatel-rg100a.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Alcatel RG100A";
@@ -19,7 +20,8 @@
                        gpios = <&pinctrl 4 1>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 5 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts
index bf997935e86dc84bce5152a0c8ae838dc3ef1c70..0a09b2d86c49930a720f5930de120dbd6d663010 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96358VW reference board";
@@ -15,7 +16,8 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 4 0>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts
index 316581d2a5a19bd3c42c6f392cbb7b9e5aede38a..a89fdb1fe4623aad662cf883da6ac13bfdc49b71 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-brcm-bcm96358vw2.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96358VW2 reference board";
@@ -19,7 +20,8 @@
                        gpios = <&pinctrl 4 1>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 5 1>;
                        default-state = "on";
                };

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 10aea48783b317432b471e80c3522c8e2948804c..809f3b39b4ca1ec2db6e1c5c8c76288d8dd1543f 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
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "BT Home Hub 2.0 Type A";
@@ -56,20 +57,23 @@
        led@0 {
                reg = <0>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
        };
 
        led_power_green: led@1 {
                reg = <1>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
        led@2 {
                reg = <2>;
                active-low;
-               label = "blue:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_BLUE>;
        };
 
        led@3 {

diff --git a/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts b/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts
index ab9d5659ba6e3fe43981142e4b982b6d7a58310b..2dc85f6776349e68b7c7d970c2cffe5408c3c997 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-comtrend-ct-6373.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend CT-6373";
@@ -29,16 +30,19 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 0>;
                        default-state = "on";
                };
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 3 1>;
                };
                wlan_green {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 9 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts
index 6d26261a34d484fb3409ad436ae07806dc5481c3..dbc4172f54d16c2cd9a216e600e74848336b1e5a 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-d-link-dsl-2650u.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "D-Link DSL-2650U";
@@ -19,7 +20,8 @@
                        gpios = <&pinctrl 4 1>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 5 1>;
                        default-state = "on";
                };

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 ff007ebe4c773230adc35e9a6eca0c6eb7ab3bf3..917fd6dc1dc566f367a76eed170845d13c960ebe 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
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "D-Link DSL-2740B/DSL-2741B rev C2/3";
@@ -40,11 +41,13 @@
                        gpios = <&pinctrl 2 0>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 4 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        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 243e2ca3003fa827980ec3031779472d7b359f33..052262dca710c464d13ad055b935f0a410a3cc41 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg553.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Huawei EchoLife HG553";
@@ -43,12 +44,14 @@
                compatible = "gpio-leds";
 
                led_power_blue: power_blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 5 1>;
                };
                hspa_red {
@@ -60,11 +63,13 @@
                        gpios = <&pinctrl 13 1>;
                };
                lan_red {
-                       label = "red:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 22 1>;
                };
                lan_blue {
-                       label = "blue:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pinctrl 23 1>;
                };
                wifi_red {

diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi
index 09a21f7ad73559ce3acde8b3446eea97255f9de2..f64e02e1c53c3fa292cf13b923d7fd894415584e 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi
+++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -52,7 +53,8 @@
                };
 
                led_power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 3 1>;
                        default-state = "on";
                };

diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi
index cc833b0c18d7e69b065f0199abb3e6df6d19c4a0..f6de31ccf91f163d8458a4c04392f73dd56f48b2 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi
+++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        chosen {
@@ -45,16 +46,19 @@
                        gpios = <&pinctrl 2 1>;
                };
                usb_green {
-                       label = "green:USB";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 3 1>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 5 1>;
                };
                inet_red {
@@ -78,7 +82,8 @@
                        gpios = <&pinctrl 10 1>;
                };
                usb_red {
-                       label = "red:USB";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 11 1>;
                };
                dsl_red {

diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts
index 12e9a0eba389d3821072a58ae5882dcba30416fc..55cea95b84bce0460b041abad6af2da2392132d4 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-agpf-s0.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Pirelli Alice Gate AGPF-S0";
@@ -36,12 +37,14 @@
                compatible = "gpio-leds";
 
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 4 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 5 1>;
                };
                service_green {

diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi
index 58075c879ad6cd7a3d376779d7d239ee3b314a54..9be493ebd549f3d064cbe334ad7e69d78c28a46e 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi
+++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        chosen {
@@ -53,7 +54,8 @@
        led@0 {
                reg = <0>;
                active-low;
-               label = "white:alarm";
+               function = LED_FUNCTION_ALARM;
+               color = <LED_COLOR_ID_WHITE>;
        };
 
        led@2 {

diff --git a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts
index f679b40ac9d065938de7e2d0c04694abeb87cd6a..1a6b9658bb164902138e8cffbc0bc93242ea02ef 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts
+++ b/target/linux/bcm63xx/dts/bcm6358-telsey-cpva642.dts
@@ -1,6 +1,7 @@
 #include "bcm6358.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Telsey CPVA642-type (CPA-ZNTE60T)";
@@ -51,7 +52,8 @@
                        gpios = <&pinctrl 2 1>;
                };
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 3 1>;
                };
                phone1_green {
@@ -71,12 +73,14 @@
                        gpios = <&pinctrl 10 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 11 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 14 1>;
                };
                wifi_green {

diff --git a/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts b/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts
index 255c1c8f6c9ab115f5029956a0c44971aa5522c6..9217fd30989f6f8cc195511325668da05e170d13 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts
@@ -1,6 +1,7 @@
 #include "bcm6362.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Huawei HG253s v2";
@@ -54,7 +55,8 @@
                };
 
                led@30 {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 30 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts
index 4bef5908e0359609b357b5b70ebf06eec9e6d890..8d457c906e1a9730843be0134fe0e3234a9a936a 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6362-netgear-dgnd3700-v2.dts
@@ -3,6 +3,7 @@
 #include "bcm6362.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear DGND3700v2";
@@ -57,7 +58,8 @@
                };
 
                led@34 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 34 1>;
                };
        };
@@ -81,14 +83,16 @@
 
        led_power_green: led@8 {
                reg = <8>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
                default-state = "on";
        };
 
        led@9 {
                reg = <9>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@10 {

diff --git a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts
index e5ae573c973856a477f4b02ba7ac5a7fc3cebc90..105e56a59692a01b0b73f7feccc8d1db3a9bad91 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts
+++ b/target/linux/bcm63xx/dts/bcm6362-sagem-fast-2504n.dts
@@ -1,6 +1,7 @@
 #include "bcm6362.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Sagem F@st 2504N";
@@ -43,11 +44,13 @@
                compatible = "gpio-leds";
 
                power_orange {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&pinctrl 2 1>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 10 1>;
                        default-state = "on";
                };
@@ -64,7 +67,8 @@
                        gpios = <&pinctrl 29 1>;
                };
                wlan_orangee {
-                       label = "orange:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&pinctrl 30 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts
index fa038962c2796b94e74c5e0e5bb866dcec0f26e5..3fe1693331a3e68615233422378b483d56009a69 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-actiontec-r1000h.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Actiontec R1000H";
@@ -48,28 +49,33 @@
                };
 
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 21 1>;
                };
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
 
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 23 1>;
                };
 
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 24 0>;
                };
 
                wps_red {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 30 1>;
                };
 

diff --git a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts
index fb1b4bcf060265933f9b5b8543b6bd044932e7c9..45046f326a96e25bb5a4cdb0a89b6e7f5682ef58 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-adb-av4202n.dts
@@ -2,6 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "ADB P.DG AV4202N";
@@ -44,20 +45,24 @@
                compatible = "gpio-leds";
 
                led_power_white: power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&pinctrl 10 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 11 GPIO_ACTIVE_LOW>;
                };
                wan_white {
-                       label = "white:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&pinctrl 26 GPIO_ACTIVE_LOW>;
                };
                wan_red {
-                       label = "red:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 27 GPIO_ACTIVE_LOW>;
                };
                phone_white {

diff --git a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts
index 50c57d527164f62d1c5a67acc56226797102d4bf..6160ab636e64e895603d7069bb1db90ecfb44476 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvngr.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96368MVNgr reference board";
@@ -27,12 +28,14 @@
                        gpios = <&pinctrl 5 0>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 23 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts
index 664e3e02f5749e4ce4c26bbf27bdcc93a6bdc382..10f98511c0cdc266927e15c18c13fb8922853021 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-brcm-bcm96368mvwg.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Broadcom BCM96368MVWG reference board";
@@ -23,12 +24,14 @@
                        gpios = <&pinctrl 5 0>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 23 1>;
                };
                ppp_fail_red {

diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
index a237d18ac71d4dbc07c86438285da0cca0c76a2e..12195de8013406de1397621528b0e69ee6426c3e 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025u.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend VR-3025u";
@@ -44,12 +45,14 @@
                        gpios = <&pinctrl 5 0>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 24 0>;
                };
                inet_red {

diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
index 2391fb067100581022b0ca9312a4a82931201f2c..6a17c49d120b9eca4584a8ab67f68277f4b83bb8 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3025un.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend VR-3025un";
@@ -44,12 +45,14 @@
                        gpios = <&pinctrl 5 0>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 24 0>;
                };
                inet_red {

diff --git a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
index b17439ea23b6ee34e58d8f31b97b2da871b84119..b56f693243145e5de17c23c35cc83da387a0c31e 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-comtrend-vr-3026e.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend VR-3026e";
@@ -44,12 +45,14 @@
                        gpios = <&pinctrl 5 0>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 24 0>;
                };
                inet_red {

diff --git a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
index 95e482bca36b214ed337625b22618ac3d8443862..89c9c26032d6eec6835b1cbbe5b6c813736ca404 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg622.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Huawei EchoLife HG622";
@@ -38,11 +39,13 @@
                        gpios = <&pinctrl 5 1>;
                };
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 11 1>;
                };
                power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 1>;
                        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 124b5ca1b7d5a3640829c43ea0adcdc664377484..778753558d4b78b0d8420c92c0efcb532574236a 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Huawei EchoLife HG655b";
@@ -59,11 +60,13 @@
                };
 
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 14 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 1>;
                        default-state = "on";
                };
@@ -72,7 +75,8 @@
                        gpios = <&pinctrl 25 1>;
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 27 1>;
                };
        };

diff --git a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
index 700adea4c19b11e521440cb5ee12d41058c14a42..b1053903f2d446383e554484579351b3dd523db4 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear DGND3700v1/DGND3800B";
@@ -62,7 +63,8 @@
                        gpios = <&pinctrl 5 1>;
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 11 1>;
                };
                usbfront_green {
@@ -74,15 +76,18 @@
                        gpios = <&pinctrl 14 1>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 22 1>;
                };
                lan_green {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 23 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        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 9ed3cc23d0e773fc4e2dae3a3ad7adbf2c04e4ef..7e018584a16fef6493a186a56dbccef0b22ec6e9 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-observa-vh4032n.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Observa VH4032N";
@@ -59,12 +60,14 @@
                        gpios = <&pinctrl 12 1>;
                };
                led_power_blue: power_blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 24 0>;
                };
                voice_blue {

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 0bc66fb031a9e6cedfb60f7042f368d38dd4b162..6118cd81117ec2bd71153d99bed2b28a6bfe9c4e 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts
+++ b/target/linux/bcm63xx/dts/bcm6368-zyxel-p870hw-51a-v2.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Zyxel P870HW-51a v2";
@@ -43,7 +44,8 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 0 0>;
                        default-state = "on";
                };
@@ -56,7 +58,8 @@
                        gpios = <&pinctrl 22 1>;
                };
                wps_orange {
-                       label = "orange:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&pinctrl 24 1>;
                };
                inet_red {

diff --git a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts
index 2f0ec53e3473d5c830376e85de7ad6438dd58c24..a25ce69f00e7a60eae20e27a653ad03402faecf3 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts
+++ b/target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Comtrend WAP-5813n";
@@ -54,16 +55,19 @@
                        gpios = <&pinctrl 5 0>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 0>;
                        default-state = "on";
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 23 1>;
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 24 0>;
                };
                inet_red {

diff --git a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts
index b96ba7eb653ff0ff205794695e6e57106422f04e..3e9d9e873cab0fdabbe114baa5cd49a3807b23ec 100644 (file)
--- a/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts
+++ b/target/linux/bcm63xx/dts/bcm6369-netgear-evg2000.dts
@@ -1,6 +1,7 @@
 #include "bcm6368.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear EVG2000";
@@ -59,20 +60,24 @@
                        gpios = <&pinctrl 5 1>;
                };
                usb_green {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 15 1>;
                };
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 22 1>;
                        default-state = "on";
                };
                power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&pinctrl 23 1>;
                };
                lan_green {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 24 1>;
                };
                wireless_green {
@@ -80,7 +85,8 @@
                        gpios = <&pinctrl 26 1>;
                };
                wan_green {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pinctrl 27 1>;
                };
        };