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 <[email protected]>

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";
 		};

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";
 	};
 

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";
 	};
 };

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";
 		};

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>;
 	};
 };
 

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>;
 	};
 };
 

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>;
 		};
 	};

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>;
 		};
 	};

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 {

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 {

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";
 	};
 };

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 {

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";
 	};
 };

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";
 	};
 

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 {

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 {

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>;
 	};
 };
 

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>;
 		};
 	};

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 {

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 {

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 {

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 {

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 {

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";
 		};

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";
 		};

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";
 		};

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";
 		};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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";
 		};

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";
 		};

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";
 		};

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";
 		};

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 {

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 {

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>;
 		};
 	};

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";
 		};

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";
 		};

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 {

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";
 		};

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>;
 		};
 	};

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 {

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>;
 		};
 	};

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";
 		};

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";
 		};

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";
 		};

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";
 		};

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 {

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>;
 		};
 	};

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";
 		};

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";
 		};

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 {

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";
 		};

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 {

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 {

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 {

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 {

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>;
 		};
 	};

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 {

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>;
 		};
 	};

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>;
 		};
 

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 {

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>;
 		};
 	};

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 {

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 {

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 {

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 {

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";
 		};

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>;
 		};
 	};

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";
 		};

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 {

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 {

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 {

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>;
 		};
 	};