lantiq: 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/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
index 67c6e87bcd1182d1f3e531e30fa1962db2503456..25a041e01d001700a4d606076bff399c83bf5878 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
@@ -28,13 +28,15 @@
 
                /* power led: red=off, green=on */
                power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                lan: lan {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
@@ -106,4 +108,6 @@
                        };
                };
        };
+#include <dt-bindings/leds/common.h>
+
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
index 144667ffb645b342ba0eb88c82e4a64f91af7963..524d97e03c022542dc54cde6f7af2fb83be9911b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
@@ -1,6 +1,7 @@
 #include "amazonse.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "netgear,dgn1000b", "lantiq,xway", "lantiq,ase";
@@ -64,12 +65,14 @@
                        default-state = "on";
                };
                wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
                power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index ba2b82dd670ae6f364446d49ed8dedc886b63504..c6f0454d10fdf3be40130cc20b996f3521304469 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
@@ -46,7 +47,8 @@
                compatible = "gpio-leds";
 
                power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -59,7 +61,8 @@
                        gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
                wlan: wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
                info_green: info_green {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index b04efd8a846cc4b48010e8e84464c5dd00fe93cc..3023d4925db589cdc94902d2da9fc4f2ab784197 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
@@ -45,7 +46,8 @@
        leds {
                compatible = "gpio-leds";
                power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -58,7 +60,8 @@
                        gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
                wlan: wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
                info_green: info_green {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index 71b32b62f5ab1c52a77df7422ef1bec583c97417..e8024d6463a1dedaa8a2f678c1d668e8451d96db 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "bt,homehub-v3a", "lantiq,xway", "lantiq,ar9";
@@ -75,16 +76,19 @@
                };
 
                power_red: power-red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
                power_orange: power-orange {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_blue: power-blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index 7e0f157bf323fe4838c70fbab4846366a28a0cd6..5a50f27c08b059799a2bafa3474631ed52f69c6b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "buffalo,wbmr-hp-g300h", "lantiq,xway", "lantiq,ar9";
@@ -57,12 +58,14 @@
                compatible = "gpio-leds";
 
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                security {
@@ -90,7 +93,8 @@
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
                led_usb: usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index 18168230b6ab4a4ce5ef797f16fea39df4532729..8409e079431b0f29751ec8d6c782039a54e33c01 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        chosen {
@@ -79,16 +80,19 @@
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
                led_usb: usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
                wifi_green: wifi {
@@ -100,7 +104,8 @@
                        gpios = <&gpio 51 GPIO_ACTIVE_LOW>;
                };
                wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 52 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
index 486261d742213b1259ad495028b448b451a3b56e..b17efe740aa31a047ce2a71e0f7738c97c950c6f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "zte,h201l", "lantiq,xway", "lantiq,ar9";
@@ -52,7 +53,8 @@
                compatible = "gpio-leds";
 
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -69,15 +71,18 @@
                        gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
                };
                wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
                led_usb: usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
index 2177726d8174588ccfa58bc080f9b09713e3a291..8baf91861c48051789c7907f5d1f460050dcc497 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
@@ -1,6 +1,7 @@
 #include "ar9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "zyxel,p-2601hn", "lantiq,xway", "lantiq,ar9";
@@ -46,12 +47,14 @@
                compatible = "gpio-leds";
 
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 11 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
                };
                online: online {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index 72f8c3bc6615cdbfc36da664ac4e8e729ff21895..3eff5cd6da57ea27d422f003aa63e05272bb61ae 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv4519pw", "lantiq,xway", "lantiq,danube";
@@ -47,16 +48,19 @@
                compatible = "gpio-leds";
 
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
                dsl: dsl {
@@ -72,7 +76,8 @@
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
                led_usb: usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
                voip {
@@ -92,15 +97,18 @@
                        gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
                };
                wps2 {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
                };
                wps {
-                       label = "orange:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
                };
                wps3 {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index 775aab4ba96b60b8a0d9cf5aea0ad66cc951f4db..c2b44ebb66e388edaaaad61be7cff8bab7bd080d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv4520pw", "lantiq,xway", "lantiq,danube";
@@ -47,7 +48,8 @@
                compatible = "gpio-leds";
 
                power_blue: power {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -60,15 +62,18 @@
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
                wps {
-                       label = "yellow:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_YELLOW>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
                wps2 {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
                /*
@@ -95,7 +100,8 @@
                        gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
                };
                led_usb: usb {
-                       label = "blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index 182b0c0bb183bfeac1a06b865e5f73b03eabcdbd..e781be33910fd06b90ef068aa25ed8ed3e8d6856 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv4525pw", "lantiq,xway", "lantiq,danube";
@@ -63,7 +64,8 @@
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
                online: online {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index 4825eb2952eae9465cb0a596ce841e5248cc26de..34bb167b6a1dc70fa4b6fbb2b7fa7a8e1528674b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv452cqw", "lantiq,xway", "lantiq,danube";
@@ -57,7 +58,8 @@
        leds {
                compatible = "gpio-leds";
                power_blue: power0 {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -70,15 +72,18 @@
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                power_red: power1 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
                wps {
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
                wps1 {
-                       label = "yellow:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_YELLOW>;
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
                fxs1 {
@@ -90,7 +95,8 @@
                        gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
                };
                wps2 {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
                };
                fxo {
@@ -102,11 +108,13 @@
                        gpios = <&gpiomm 4 1>;
                };
                led_usb: usb {
-                       label = "blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
-                       label = "blue:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
                };
                /*

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 3f957c63a604087b04884c25dcaaf5dad381f766..1c1fa2f77dd833c27cfb7392e19de3e58a82e53e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv7506pw11", "lantiq,xway", "lantiq,danube";
@@ -45,11 +46,13 @@
        leds {
                compatible = "gpio-leds";
                wlan: wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
                power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -62,7 +65,8 @@
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
                internet_red {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index fb3363b2e2aab8c7b8ea97e82ce7d324c2862ade..34b88084429328f4baf74c60c09c55af5c8a673e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv7518pw", "lantiq,xway", "lantiq,danube";
@@ -46,7 +47,8 @@
        leds {
                compatible = "gpio-leds";
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -59,11 +61,13 @@
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
                online2 {
@@ -71,7 +75,8 @@
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
                led_usb: usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
                voice {
@@ -91,15 +96,18 @@
                        gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
                };
                wps {
-                       label = "amber:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
                };
                wps2 {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
                };
                wps3 {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index d67efb4fca5f2fef85da6f91e99201fb61a197b8..890eac972dd22cb32e6acdc288031add8bee7ca6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv7525pw", "lantiq,xway", "lantiq,danube";
@@ -45,12 +46,14 @@
        leds {
                compatible = "gpio-leds";
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power1 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
                online: online {
@@ -66,7 +69,8 @@
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
                wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 41a0e1b74a963b32ee77d9bb2ad2f968cea0ca48..f56ee53e3902156322b6bdb4a810f61b2378b92f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv752dpw", "lantiq,xway", "lantiq,danube";
@@ -57,7 +58,8 @@
        leds {
                compatible = "gpio-leds";
                power_blue: power1 {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
                internet_red: internet {
@@ -69,7 +71,8 @@
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                power_red: power {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index 4fb135763d5ba50ce12911cedad15bc7656a9909..910cf65b76a33095e84ecfc31f46cd2583a24b31 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv752dpw22", "lantiq,xway", "lantiq,danube";
@@ -54,7 +55,8 @@
        leds {
                compatible = "gpio-leds";
                power_blue: power1 {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
                internet_red: internet {
@@ -66,7 +68,8 @@
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
                power_red: power {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
index d6a917057d71e5004f1731ba2e7948c7db678b1e..1a8b29a4773d7196354f09691cfb4664cfa8180f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "arcadyan,arv8539pw22", "lantiq,xway", "lantiq,danube";
@@ -47,12 +48,14 @@
                compatible = "gpio-leds";
 
                power_green: power-green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power-red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
@@ -67,7 +70,8 @@
                };
 
                wireless_green: wireless-green {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
                /*

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index 85536b0082a579ee7eee601a0e3fc63752ec6782..4a422c6f4af6a72d227595219ad609ea0d43bb47 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
@@ -1,6 +1,7 @@
 #include "danube.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "bt,homehub-v2b", "lantiq,xway", "lantiq,danube";
@@ -86,16 +87,19 @@
                };
 
                power_red: power-red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
                };
                power_orange: power-orange {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
                power_blue: power-blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
index fa46dc30fd5821d66630dc4db4ccea2b292bdc61..37cf61144ec633ab1f8e87acc016e01a0203ae94 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
@@ -47,7 +47,8 @@
                        gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                };
                STATUS {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
                };
                ERROR {
@@ -89,4 +90,6 @@
                };
        };
 };
+#include <dt-bindings/leds/common.h>
+
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
index d6591aa10e9a313270a71eb1bddb9c2da72a9f5f..3cc2f2cf6836ceb39604fafc50a85f768cee744e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
@@ -46,7 +46,8 @@
                        gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                };
                STATUS {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
                };
 
@@ -68,4 +69,6 @@
                };
        };
 };
+#include <dt-bindings/leds/common.h>
+
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
index e25145d86937f806c19df8c26299f4b7acbb8c10..b4b21e3b487a2882dc0adeacd3f4423c58bc7883 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
@@ -42,7 +42,8 @@
                        default-state = "keep";
                };
                LED_5 {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -107,4 +108,6 @@
                compatible = "at,24c02";
                reg = <0x51>;
        };
+#include <dt-bindings/leds/common.h>
+
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
index bad808e9bf478620d9410176ed2ddd5c4914d819..f4e6de8e9e030e541cf0270344030b860637d6e9 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
@@ -48,7 +48,8 @@
                        default-state = "keep";
                };
                ETH {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -63,4 +64,6 @@
                        default-state = "keep";
                };
        };
+#include <dt-bindings/leds/common.h>
+
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
index 2c0a51aa7be5ef79d707175d1d8c4acf39a9e3ff..46fc837f4dae0d0fa6b141782a124d4263bfb1f4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
@@ -48,7 +48,8 @@
                        default-state = "keep";
                };
                ETH {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -80,4 +81,6 @@
                        gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
                };
        };
+#include <dt-bindings/leds/common.h>
+
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
index 2cc70e6e40e96c94de173e79bf0831afe1247463..ce8ffc83461ff32c79a665e592e51f8ebca20e6d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
@@ -60,7 +60,8 @@
                        default-state = "keep";
                };
                ETH {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -76,4 +77,6 @@
                };
        };
 };
+#include <dt-bindings/leds/common.h>
+
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
index 611b02f8b3ef704270c9f8fd07968c3720f86c81..86eaf093290a0f72d35a95c0f563860a7861e213 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
@@ -27,7 +27,8 @@
                        default-state = "keep";
                };
                LED_1 {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -48,4 +49,6 @@
                };
        };
 };
+#include <dt-bindings/leds/common.h>
+
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
index 77fcff33920eea4c9fc7fe3dedc98b625640c65b..eac6b0792dce19ad85f911a42721b5ec40d0c478 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -46,13 +47,15 @@
 
                /* power-* is a bicolour led */
                power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
 
                power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index 935aa08cb906056805ce8b2dfeaa30c583027023..9107624eb17cf3633cf27182c313e178fcfadc89 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -50,7 +51,8 @@
                compatible = "gpio-leds";
 
                lan_green {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
                internet_red {
@@ -58,12 +60,14 @@
                        gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
                };
                power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                alarm_blue {
-                       label = "blue:alarm";
+                       function = LED_FUNCTION_ALARM;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
                internet_orange {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
index fb771edcb7e65dba17759ec0e4a0bb41b472ff56..9238fba5d639677262f4b1c0bd6b10899fd9e965 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -39,7 +40,8 @@
                compatible = "gpio-leds";
 
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
                dsl: dsl {
@@ -47,7 +49,8 @@
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index 69685d801b82189704b38e8b791f4ad0becb1f47..90d11c991dc430deb43a4e40ca7ac69a50c09edf 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -62,7 +63,8 @@
                };
 
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -78,13 +80,15 @@
                };
 
                wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index 71046cfd58c68af90aef3e4c7ef6c1b4c27886c7..e0bcaa951b31e735593aecfeeda823cf27a03d7b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -59,11 +60,13 @@
                        gpios = <&stp 2 GPIO_ACTIVE_LOW>;
                };
                wps_red {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&stp 3 GPIO_ACTIVE_LOW>;
                };
                wps_green {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 4 GPIO_ACTIVE_LOW>;
                };
                upgrade {
@@ -103,12 +106,14 @@
                        gpios = <&stp 13 GPIO_ACTIVE_LOW>;
                };
                power_green: power2 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 14 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_red: power {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&stp 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
index 664327a861204c67f8f0ca45bb4833e9e70dae87..4c9b073b70de77559db038a8a94922cc3b9ff363 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -53,13 +54,15 @@
                compatible = "gpio-leds";
 
                power_green: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                power_red: power2 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
                };
 
@@ -69,7 +72,8 @@
                };
 
                wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
                };
 
@@ -79,7 +83,8 @@
                };
 
                lan {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3390.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3390.dts
index ba88a812706d355fa8a4d6ee534663f5d0441a33..aef33f2f091cbb654051ffd17c33a48bd1704f92 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3390.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3390.dts
@@ -3,6 +3,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -50,13 +51,15 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                led_power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                };
 
@@ -71,7 +74,8 @@
                };
 
                led_lan {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3490.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3490.dtsi
index 4d96abd1c3f37ac07cc188b771f1c0bf4c577e82..fabc56a5aca4c1f755d8aeeb5c46d40b90f07194 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3490.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz3490.dtsi
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include <dt-bindings/leds/common.h>
+
 #include "vr9_avm_fritzxx90.dtsi"
 
 / {
@@ -15,12 +17,14 @@
 
 &leds {
        led_lan: lan {
-               label = "green:lan";
+               function = LED_FUNCTION_LAN;
+               color = <LED_COLOR_ID_GREEN>;
                gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
        };
 
        led_wifi: wifi {
-               label = "green:wlan";
+               function = LED_FUNCTION_WLAN;
+               color = <LED_COLOR_ID_GREEN>;
                gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
        };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz5490.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz5490.dtsi
index 2aadd8e6661a60e938c5056cbf2aab325e1c331f..b38ac9f8b84a7da4520a82fb04fd135738d6fc57 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz5490.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz5490.dtsi
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include <dt-bindings/leds/common.h>
+
 #include "vr9_avm_fritzxx90.dtsi"
 
 / {
@@ -20,7 +22,8 @@
        };
 
        led_wifi: wifi {
-               label = "green:wlan";
+               function = LED_FUNCTION_WLAN;
+               color = <LED_COLOR_ID_GREEN>;
                gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
        };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
index 7324127d2a8ece874e9041e6b99febc03d6f8073..e7fc9a4f55b7b4ea2cbfffce8fbe749117c8ff7a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
@@ -3,6 +3,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -48,13 +49,15 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                led_power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
                };
 
@@ -64,7 +67,8 @@
                };
 
                led_wifi: wifi {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
index 11f318db5de710df67ce83209eccd099f8eb1344..e831af186defc53e9683eec77bf488084550a4c1 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
@@ -3,6 +3,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -49,13 +50,15 @@
                compatible = "gpio-leds";
 
                power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7430.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7430.dts
index 7bc64b76e7c860fe2c75e38b5f3e692133c23dbc..cbfa7ebe48f6de6ea3b19c1158611c48b540f7a3 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7430.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7430.dts
@@ -3,6 +3,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -49,7 +50,8 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7490.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7490.dtsi
index 6488c574c293d49ac76218102e7a419de67ea902..0c682dba3a44759b14abf4947e03430c3a969aba 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7490.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7490.dtsi
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include <dt-bindings/leds/common.h>
+
 #include "vr9_avm_fritzxx90.dtsi"
 
 / {
@@ -25,7 +27,8 @@
        };
 
        led_wifi: wifi {
-               label = "green:wlan";
+               function = LED_FUNCTION_WLAN;
+               color = <LED_COLOR_ID_GREEN>;
                gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritzxx90.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritzxx90.dtsi
index 4d138a58e66d08ecc0b32f085158b0f6d9a2ab63..0a2027fb74f52690d9be3ea163c15f2500ea9328 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritzxx90.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritzxx90.dtsi
@@ -3,6 +3,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -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 = <&gpio 45 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index be44cb716197e2bc1aeace1746721c280eaa6139..dc43b3a99416d91c8d568e700c280661a40722bb 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -82,16 +83,19 @@
 
                /* power-* is a single RGB led */
                power_red: power-red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
                power_green: power-green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
                power_blue: power-blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
index eea27a2a1f31eaa3feebc1ad5ab6734d5f1e2dc1..31bbfc67cc982580a5ada98004a14805fd96d335 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -104,7 +105,8 @@
                };
 
                wan: wan {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
                };
 
@@ -134,7 +136,8 @@
                };
 
                power_g: power_g {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 49 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
index 8df81111fa2db45256c68229a81374e56203166f..a8b5f25810f1ad351ee3b0d299f0208641a36eb9 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -41,7 +42,8 @@
                compatible = "gpio-leds";
 
                power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 9 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -75,11 +77,13 @@
                        linux,default-trigger = "usbport";
                };
                sd {
-                       label = "green:sd";
+                       function = LED_FUNCTION_SD;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 14 GPIO_ACTIVE_HIGH>;
                };
                wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 12 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
index b817ff3224e98bc2ecfc7dd521654a23d3b8da8a..e9ba3ad5ee40f17ed6bbee291de8f007f8b344d3 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -55,20 +56,24 @@
                compatible = "gpio-leds";
 
                power_amber: power_amber {
-                       label = "amber:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
                power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                lan_amber {
-                       label = "amber:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
                };
                lan_green {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
index 39d7b4908cd46e5a8a2244132bd2312d911ca7cd..d133b5b6d31c8dbf9c4eff54fe69dab100e87a05 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -66,7 +67,8 @@
                };
 
                usb0 {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
                        trigger-sources = <&ehci_port1>;
                        linux,default-trigger = "usbport";
@@ -80,7 +82,8 @@
                };
 
                led_wps: wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
index 4ad7a484e6af86d2d24acdaede20030157690855..3f55796232d426af836b4f3557178332eeef7b88 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
@@ -19,7 +19,10 @@
 
 &leds {
        wps {
-               label = "blue:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_BLUE>;
                gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
        };
+#include <dt-bindings/leds/common.h>
+
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
index acb54ee80b317286d596d8920587696383621a4d..2160adf7933eca865335da743818f27d4c719b04 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -48,7 +49,8 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -64,19 +66,22 @@
                };
 
                usb {
-                       label = "blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ehci_port1>, <&ehci_port2>;
                        linux,default-trigger = "usbport";
                };
 
                eth {
-                       label = "blue:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "blue:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
index ff7dce3477abd59f2debd8f906a05aee6479539d..89b7e3e98fbf81f881b4db81831c921e15e42d82 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
@@ -1,6 +1,7 @@
 #include "vr9.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
@@ -63,19 +64,23 @@
                        gpios = <&stp 19 GPIO_ACTIVE_LOW>;
                };
                wireless_orange {
-                       label = "orange:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&stp 20 GPIO_ACTIVE_LOW>;
                };
                wireless_green: wireless_green {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 21 GPIO_ACTIVE_LOW>;
                };
                power_red: power {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&stp 22 GPIO_ACTIVE_LOW>;
                };
                power_green: power2 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&stp 23 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };