bmips: 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/bmips/dts/bcm63167-sercomm-h500-s.dtsi b/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
index a389187d8ddd6926692b76c85a4772b3d2f4e7a4..66c64d990bdef38a90df1f8d19cd92dada21d83b 100644 (file)
--- a/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
+++ b/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm63268.dtsi"
 
 / {
@@ -59,7 +61,8 @@
 
        led_power_red: led@8 {
                reg = <8>;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
                panic-indicator;
        };
 
@@ -95,7 +98,8 @@
 
        led_power_green: led@17 {
                reg = <17>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@23 {

diff --git a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
index 3f830f058e6b24d4b900b95b0e0e623fa0c875af..fed4428405cb1ebf2f8e78276fe4dc8e74ae0795 100644 (file)
--- a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
+++ b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm63268.dtsi"
 
 / {
@@ -83,13 +85,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 {
@@ -143,7 +147,8 @@
        led_power_green: led@20 {
                reg = <20>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 };
 

diff --git a/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts b/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
index 3c79d38bfbdd0971d916f9ff1befe76a10dceeb7..cdfd58e6090b668284c679d6a02ddf3b0bed5f46 100644 (file)
--- a/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
+++ b/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm63268.dtsi"
 
 / {
@@ -109,7 +111,8 @@
 
                led_power_red: led@8 {
                        reg = <8>;
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                };
 
                led@9 {

diff --git a/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts b/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts
index b0576748d3500c883672bc3d58ffc4e95e39f674..375b01b67372afbd1d9be6b0b90860a46377e793 100644 (file)
--- a/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts
+++ b/target/linux/bmips/dts/bcm63169-comtrend-vg-8050.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm63268.dtsi"
 
 / {
@@ -121,20 +123,23 @@
        led_power_red: led@3 {
                reg = <3>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
                panic-indicator;
        };
 
        led_power_green: led@6 {
                reg = <6>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               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 {
@@ -158,7 +163,8 @@
        led@14 {
                reg = <14>;
                active-low;
-               label = "red:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_RED>;
        };
 };
 

diff --git a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
index 052f61002bdc4ed9e52223c9c15ee8a4dd57379b..c3c9a9bdf45f24e4e199df8673184378c8f0ad15 100644 (file)
--- a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6318.dtsi"
 
 / {
@@ -128,19 +130,22 @@
        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>;
        };
 
        led@2 {
                reg = <2>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@4 {
@@ -192,7 +197,8 @@
        led_power_red: led@11 {
                reg = <11>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
                panic-indicator;
        };
 };

diff --git a/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts b/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts
index 649c5958483b7cb96f92b10e866755723fcdcd37..755312974d665ec8b38eb94f9af05c38ce1220c7 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts
+++ b/target/linux/bmips/dts/bcm6328-arcadyan-ar7516.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6328.dtsi"
 
 / {
@@ -117,7 +119,8 @@
        led@6 {
                reg = <6>;
                active-low;
-               label = "green:wan";
+               function = LED_FUNCTION_WAN;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@7 {

diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts
index 09e6f99389160c2c8e73536a27224426f5c1d8ea..d5a3452e7911e0545b971fc80427b8bd03c26770 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5381u.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6328.dtsi"
 
 / {
@@ -114,7 +116,8 @@
        led_alarm_red: led@2 {
                reg = <2>;
                active-low;
-               label = "red:alarm";
+               function = LED_FUNCTION_ALARM;
+               color = <LED_COLOR_ID_RED>;
                panic-indicator;
        };
 
@@ -127,7 +130,8 @@
        led_power_green: led@4 {
                reg = <4>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 };
 

diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
index 7ee87c636ec4e449a49fb35a6f69097d8a0235b5..402e54e5df7392c61f772aae2b756fe24240421d 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6328.dtsi"
 
 / {
@@ -136,7 +138,8 @@
 
        led_power_red: led@4 {
                reg = <4>;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
                panic-indicator;
        };
 
@@ -147,7 +150,8 @@
 
        led_power_green: led@8 {
                reg = <8>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@11 {

diff --git a/target/linux/bmips/dts/bcm6328-innacomm-w3400v6.dts b/target/linux/bmips/dts/bcm6328-innacomm-w3400v6.dts
index f2f70fcb17791901f52c971244cd75474479c359..68f10d46a58f84bc8c357e9b4f079e4a52d7ca69 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-innacomm-w3400v6.dts
+++ b/target/linux/bmips/dts/bcm6328-innacomm-w3400v6.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6328.dtsi"
 
 / {
@@ -129,21 +131,24 @@
        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>;
                panic-indicator;
        };
 
        led@11 {
                reg = <11>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 };
 

diff --git a/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts b/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts
index d096a1a42cdf40d33bb8a5f0f196dff9f3a3c4f7..8890477f328995aab1b4d2c019d0c95b943934aa 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts
+++ b/target/linux/bmips/dts/bcm6328-nucom-r5010unv2.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6328.dtsi"
 
 / {
@@ -132,26 +134,30 @@
        led_power_green: led@4 {
                reg = <4>;
                active-low;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led_power_red: led@5 {
                reg = <5>;
                active-low;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
                panic-indicator;
        };
 
        led@10 {
                reg = <10>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@11 {
                reg = <11>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 };
 

diff --git a/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts b/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts
index 438f1d5fec92927a94d824a84b4d997c941471b7..03a58a6fdec41d539accd41ee966eb2af9810de8 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts
+++ b/target/linux/bmips/dts/bcm6328-sercomm-ad1018.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6328.dtsi"
 
 / {
@@ -107,7 +109,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";
        };
 
@@ -132,7 +135,8 @@
        led@13 {
                reg = <13>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@14 {
@@ -144,7 +148,8 @@
        led@15 {
                reg = <15>;
                active-low;
-               label = "green:usb";
+               function = LED_FUNCTION_USB;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@17 {

diff --git a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
index c2693fa716070237a0cbf66b8bb33178ed223b76..554ef1993e7b4586eca83a2548f0dacaa337b81b 100644 (file)
--- a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
+++ b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6358.dtsi"
 
 / {
@@ -65,7 +67,8 @@
                };
 
                led_power_red: led@3 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
@@ -120,7 +123,8 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "red:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&ath9k 2 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts b/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
index 32682b2610e93ccb0d6caf05f5910c163a913a48..38dcec3e9b8e6616147dbeaa920072b8f42a0d7e 100644 (file)
--- a/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6362.dtsi"
 
 / {
@@ -47,7 +49,8 @@
                };
 
                led@30 {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
index f7182b78dac6d8212cddec15ec1f7d74716fe46c..94e9aa3d21cfa74b6b0b8acab7816e7b7b32d601 100644 (file)
--- a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6362.dtsi"
 
 / {
@@ -48,7 +50,8 @@
                };
 
                led_power_red: led@34 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
                        panic-indicator;
                };
@@ -85,13 +88,15 @@
 
        led_power_green: led@8 {
                reg = <8>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@9 {
                reg = <9>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@10 {

diff --git a/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts b/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts
index fec67d0db98eb9499e36cbe83c237b399098fe67..8dc37d492f5306546bb7b9f3b5b3e1e70721f74c 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts
+++ b/target/linux/bmips/dts/bcm6368-actiontec-r1000h.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6368.dtsi"
 
 / {
@@ -36,38 +38,45 @@
                compatible = "gpio-leds";
 
                led@5 {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
                };
 
                led@21 {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: led@22 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
 
                led@23 {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: led@24 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
                        panic-indicator;
                };
 
                led@30 {
-                       label = "red:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
                };
 
                led@31 {
-                       label = "red:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
index 63a07fe70e3a567c52e0d6bf00bdd47537078262..e0bac82ff89976ff1d05261c764ea0dffd36f1b7 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6368.dtsi"
 
 / {
@@ -39,12 +41,14 @@
                };
 
                led_power_green: led@22 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
 
                led_power_red: led@24 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
                        panic-indicator;
                };

diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts
index 937fbdd1a1d7cae8aeffe76eefbb621c7a591f26..a0beba2c0ce1c034bb941d0459a30dde685df137 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025un.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6368.dtsi"
 
 / {
@@ -39,12 +41,14 @@
                };
 
                led_power_green: led@22 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
 
                led_power_red: led@24 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
                        panic-indicator;
                };

diff --git a/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi b/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
index c647559d6ce57a6f0a8b673b359a1613272e9733..49c546692a60b4d94b2438b5e69587e570e4d699 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
+++ b/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6368.dtsi"
 
 / {
@@ -45,17 +47,20 @@
                };
 
                led@4 {
-                       label = "red:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                led@5 {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                led@11 {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
@@ -72,18 +77,21 @@
                };
 
                led_power_red: led@22 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        panic-indicator;
                };
 
                led@23 {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: led@24 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts b/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
index 0f74c4b902df0cc9dbffae7e079ece6e5718d022..f9fefaccb8103ca92277cf086a28f75f70ddb0be 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
+++ b/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6368.dtsi"
 
 / {
@@ -56,12 +58,14 @@
                };
 
                led_power_blue: led@22 {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
 
                led_power_red: led@24 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
                        panic-indicator;
                };

diff --git a/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts b/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts
index 70572b49a91a06c5b2bab70e94a9ca94ac563500..1b8b155f266ec237b51c0339333a8a7c5cb1b812 100644 (file)
--- a/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts
+++ b/target/linux/bmips/dts/bcm6369-comtrend-wap-5813n.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6368.dtsi"
 
 / {
@@ -48,22 +50,26 @@
                };
 
                led@14 {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: led@22 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
 
                led@23 {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: led@24 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
                        panic-indicator;
                };

diff --git a/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts b/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
index 00017238c852ae006beec8594e12124315d39a50..cf19bb33f46fae536405a88e67c0820baa05b29e 100644 (file)
--- a/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
+++ b/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6368.dtsi"
 
 / {
@@ -56,28 +58,33 @@
                };
 
                led@15 {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: led@22 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: led@23 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        panic-indicator;
                };
 
                led@24 {
-                       label = "green:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
                };
 
                led@27 {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
        };