ipq806x: 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/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts
index 0c669dcbfe62c75bb0bf3c191fb7457986c0993b..76751910e01c4d4d00abd430ec2b4de7be0d6a15 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts
@@ -70,12 +70,14 @@
                pinctrl-names = "default";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>;
                };
 
                led_power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&qcom_pinmux 35 GPIO_ACTIVE_HIGH>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts
index f76e098d9e6188126a31cbb116cef41cfe95a4a6..6e4c9bc773c85f5302c65c2e5871b4aa06d1b88b 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include <dt-bindings/leds/common.h>
+
 #include "qcom-ipq8064-ad7200-c2600.dtsi"
 
 / {
@@ -57,7 +59,8 @@
                pinctrl-names = "default";
 
                lan {
-                       label = "blue:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&qcom_pinmux 2 GPIO_ACTIVE_HIGH>;
                };
 
@@ -82,17 +85,20 @@
                };
 
                wan_orange {
-                       label = "orange:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
                };
 
                wan_blue {
-                       label = "blue:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>;
                };
 
@@ -102,7 +108,8 @@
                };
 
                led_status: status {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index cef1aba34445d3e4415e97c03529d0e19caa2448..33d8f78e58ac9b2e92e7a9eb2128ff5f2fe61a5a 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
@@ -55,7 +55,8 @@
                pinctrl-names = "default";
 
                lan {
-                       label = "white:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
                };
 
@@ -70,22 +71,26 @@
                };
 
                wps {
-                       label = "white:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
 
                wan_amber {
-                       label = "amber:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
                };
 
                wan_white {
-                       label = "white:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>;
                };
 
                power: power {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -116,4 +121,6 @@
                        bias-pull-up;
                };
        };
+#include <dt-bindings/leds/common.h>
+
 };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 3cd1bd2045290425541de33d87146fd1daa59153..8077c3a0901242c0177c922af57d80ed22c8a919 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear Nighthawk X4 D7800";
@@ -77,22 +78,26 @@
                };
 
                power_amber: power_amber {
-                       label = "amber:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
 
                wan_white {
-                       label = "white:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
                };
 
                wan_amber {
-                       label = "amber:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
                };
 
                wps {
-                       label = "white:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
                };
 
@@ -102,7 +107,8 @@
                };
 
                power_white: power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
index aab44ea9e3188cbd926ee79a9008c3ccf03d1b26..2a565cc2db25a68f8da6b8a51856aa4296a34901 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
+#include <dt-bindings/leds/common.h>
+
 #include "qcom-ipq8064-eax500.dtsi"
 
 / {
@@ -51,7 +53,8 @@
                pinctrl-names = "default";
 
                led_power: power {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index bc3a2c304964d63291bbcec020174398795aac2a..036485ecc607b502009759519fb00e6edb93a7ed 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -54,12 +54,14 @@
                pinctrl-names = "default";
 
                wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                };
 
                led_power: power {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -119,4 +121,6 @@
        qcom,poll_required = <0>;       /* no polling */
        qcom,rgmii_delay = <0>;
        qcom,emulation = <0>;
+#include <dt-bindings/leds/common.h>
+
 };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-fap-421e.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-fap-421e.dts
index 1902a2f996e45f5ab91dc113426ae2a1850ca54d..bb66c6c80831668784de0de97e6f6d49716eac8e 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-fap-421e.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-fap-421e.dts
@@ -80,7 +80,8 @@
                };
 
                led_power_yellow: power-yellow {
-                       label = "yellow:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_YELLOW>;
                        gpios = <&qcom_pinmux 58 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-g10.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-g10.dts
index efcb6ec24110939a13e9a727136ffda28c0a192c..24273291cb1e4981c71d845340c1ee0da8045124 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-g10.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-g10.dts
@@ -2,6 +2,7 @@
 #include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
@@ -34,17 +35,20 @@
                 */
 
                status_yellow {
-                       label = "yellow:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_YELLOW>;
                        gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_amber: status_amber {
-                       label = "amber:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_blue: status_blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
 
@@ -54,7 +58,8 @@
                 * about the LED being white.
 
                status_white {
-                       label = "white:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
                };
                */

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 41360b4a55b5964fde0e6dad28f95745c278e27d..c2703b05d7860b69c8b71659ad943b573c67b0a4 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8064-v1.0.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
@@ -81,22 +82,26 @@
                };
 
                power_amber: power_amber {
-                       label = "amber:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
 
                wan_white {
-                       label = "white:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
                };
 
                wan_amber {
-                       label = "amber:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
                };
 
                wps {
-                       label = "white:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
                };
 
@@ -106,7 +111,8 @@
                };
 
                power_white: power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 88c0daab40491ab8603c3f29b3aad52f041a3d7e..6c52d51ebc17e92e24d6c3a9e978e0ea49fd432c 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Netgear Nighthawk X4 R7500v2";
@@ -77,7 +78,8 @@
                };
 
                status {
-                       label = "amber:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
 
@@ -87,12 +89,14 @@
                };
 
                wan {
-                       label = "white:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
                };
 
                wps {
-                       label = "white:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
                };
 
@@ -102,7 +106,8 @@
                };
 
                power: power {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index ac62470df4824117a9bd6176424ffb303cdfeb4d..62530efeb1f2b00630b1bb4edb973f2c2230b738 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "TP-Link Archer VR2600v";
@@ -77,12 +78,14 @@
                };
 
                usb {
-                       label = "white:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
                };
 
                lan {
-                       label = "white:lan";
+                       function = LED_FUNCTION_LAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
 
@@ -97,7 +100,8 @@
                };
 
                power: power {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
@@ -108,7 +112,8 @@
                };
 
                wan {
-                       label = "white:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index a376eb0e2fe9255e6b1b05a6d601534f2a5296b5..0afc9219c9cf242405590743461263856f6bf57b 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "NEC Aterm WG2600HP";
@@ -71,7 +72,8 @@
                };
 
                power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
                };
 
@@ -86,7 +88,8 @@
                };
 
                power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index f8b20b0635f2c14f33e1b1e67fb32f32a5d3dd49..0fb7e0531d5230b98561d97defc9d1c5555d6c2d 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -8,6 +8,7 @@
 #include "qcom-ipq8064-v1.0.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
@@ -63,7 +64,8 @@
                };
 
                usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index d484ba9c6036d0c505db7293b7953a9faa034d6a..58074258306f3f13b253b3eaecc8fe81a0c1553f 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
@@ -2,6 +2,7 @@
 #include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Buffalo WXR-2533DHP";
@@ -30,7 +31,8 @@
                pinctrl-names = "default";
 
                usb {
-                       label = "green:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port0 &hub_port1>;
@@ -77,7 +79,8 @@
                };
 
                power: power {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index db5acd47d7499b2efe310b4c5b4996c7aba40d79..7d22b4f5415554468024b65173a1afa7ec071273 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8065-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "ZyXEL NBG6817";
@@ -68,7 +69,8 @@
                };
 
                power: power {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
index 902df23501e72c47fc9a98ecf6f98eaeda695927..a7f0b1dbf03423b0e72b256f33d47e5fa6e441fb 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
@@ -1,6 +1,7 @@
 #include "qcom-ipq8065-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        memory@0 {
@@ -71,23 +72,27 @@
                pinctrl-names = "default";
 
                power_white: power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
 
                power_amber: power_amber {
-                       label = "amber:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
 
                wan_white {
-                       label = "white:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
                };
 
                wan_amber {
-                       label = "amber:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
                };
 
@@ -97,7 +102,8 @@
                };
 
                wps {
-                       label = "white:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
index 0e63ddaa7aae7e9261f90e0ce48831fff423612a..8818e95e8d1b3b31d75a72d2adb6a85857f59f3f 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
@@ -2,6 +2,7 @@
 
 #include "qcom-ipq8065-smb208.dtsi"
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Arris TR4400 v2";
@@ -51,12 +52,14 @@
                pinctrl-names = "default";
 
                led_status_red: status_red {
-                       label = "red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_blue: status_blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ap3935.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ap3935.dts
index 6d473d43ab12aa638352262f9be6beb60ef4c776..0c865ef7c7cf1fc65640dacb62ec0e46e54ca807 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ap3935.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ap3935.dts
@@ -3,6 +3,7 @@
 #include "qcom-ipq8064-v2.0.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
@@ -52,12 +53,14 @@
                pinctrl-names = "default";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&qcom_pinmux 22 GPIO_ACTIVE_LOW>;
                };
 
                led_power_orange: power_orange { 
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&qcom_pinmux 23 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
index 50c1d37c29287ec94d1ca60524f87da9eb84fd60..9f6c5fb696978402ff54a0f35861f44bc27af781 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
@@ -1,6 +1,7 @@
 #include "qcom-ipq8064-v2.0-smb208.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
@@ -67,7 +68,8 @@
                pinctrl-names = "default";
 
                led_power_green: power_green {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
                };
 
@@ -87,7 +89,8 @@
                };
 
                led_power_red: power_red {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&qcom_pinmux 28 GPIO_ACTIVE_LOW>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts
index d9d284fcfaf91349a599360c35a0e5896b9b0efe..7ec11de56b637c21ada0794e361790c130eccff2 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts
@@ -3,6 +3,7 @@
 #include "qcom-ipq8068-cryptid-common.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Meraki MR42";
@@ -38,7 +39,8 @@
                pinctrl-names = "default";
 
                led_power: power {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&qcom_pinmux 31 GPIO_ACTIVE_HIGH>;
                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
index 522fa12fd977aa95c69fe9a720d8308384ddbe80..7512bfb74f1c2de77556c2e95003e6d57f2d67cb 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
@@ -3,6 +3,7 @@
 #include "qcom-ipq8068-cryptid-common.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Meraki MR52";
@@ -40,7 +41,8 @@
                pinctrl-names = "default";
 
                led_power: power {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&qcom_pinmux 19 GPIO_ACTIVE_HIGH>;
                };