diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2024-02-07 14:48:37 +0100 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2024-02-07 14:48:37 +0100 |
| commit | a9e0d97e1fc837eb896313dc183ed6b25b31d1d8 (patch) | |
| tree | 34e40d9f47c71edf2e63b54c84ab7d4f42f50e64 /target/linux/ipq40xx/files/arch | |
| parent | 502ac21e8fdeedb4b192ff960fecc44b3db35af5 (diff) | |
ipq40xx: 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>
Diffstat (limited to 'target/linux/ipq40xx/files/arch')
48 files changed, 254 insertions, 103 deletions
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts index 4cf5d45ff9..f43c4b8000 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts @@ -6,6 +6,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -78,17 +79,20 @@ compatible = "gpio-leds"; status_red { - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; led_status_green: status_green { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; status_blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts index 17b67c2378..ceaa1edd45 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -31,13 +32,15 @@ compatible = "gpio-leds"; status: status { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; default-state = "keep"; }; wan { - label = "amber:wan"; + function = LED_FUNCTION_WAN; + color = <LED_COLOR_ID_AMBER>; gpios = <ðphy4 1 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts index 0609324310..388b2dd590 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts @@ -4,6 +4,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -83,7 +84,8 @@ compatible = "gpio-leds"; power { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts index ea00dd83f5..c388ceca27 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -66,17 +67,20 @@ compatible = "gpio-leds"; led_status_red: status_red { - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 0 GPIO_ACTIVE_LOW>; }; led_status_green: status_green { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 3 GPIO_ACTIVE_LOW>; }; led_status_blue: status_blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts index 493905d56d..fef549035d 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -52,12 +53,14 @@ compatible = "gpio-leds"; led_red: red { - label = "red:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 4 GPIO_ACTIVE_LOW>; }; led_green: green { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts index d890e83c89..50e7f3d4e0 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -86,7 +87,8 @@ compatible = "gpio-leds"; power: status { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts index 778394a965..e9d4775fd8 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -66,12 +67,14 @@ compatible = "gpio-leds"; power: orange { - label = "orange:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_ORANGE>; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; lan { - label = "blue:lan"; + function = LED_FUNCTION_LAN; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts index c5804b4896..e74d110b3d 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -36,7 +37,8 @@ compatible = "gpio-leds"; led_power: power { - label = "yellow:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_YELLOW>; gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts index 396595ba51..bca85cf4ab 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -66,7 +67,8 @@ compatible = "gpio-leds"; led_power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts index 3616149451..701dc936f1 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -70,7 +71,8 @@ compatible = "gpio-leds"; power: white { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts index 69275e24b8..17bac82bfe 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -76,7 +77,8 @@ compatible = "gpio-leds"; power: power { - label = "amber:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_AMBER>; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi index 0e1527ad4f..918224607a 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi @@ -18,6 +18,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -107,12 +108,14 @@ compatible = "gpio-leds"; power_amber: power_amber { - label = "amber:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_AMBER>; gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>; }; power_green: power_green { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>; }; @@ -147,7 +150,8 @@ }; wps { - label = "green:wps"; + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 1 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts index ec1112ee2b..524bcbcb2b 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -87,7 +88,8 @@ compatible = "gpio-leds"; wlan { - label = "green:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_GREEN>; gpios = <ðphy0 0 GPIO_ACTIVE_HIGH>; }; @@ -98,17 +100,20 @@ }; wan { - label = "green:wan"; + function = LED_FUNCTION_WAN; + color = <LED_COLOR_ID_GREEN>; gpios = <ðphy1 0 GPIO_ACTIVE_HIGH>; }; power: power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <ðphy2 1 GPIO_ACTIVE_HIGH>; }; lan { - label = "green:lan"; + function = LED_FUNCTION_LAN; + color = <LED_COLOR_ID_GREEN>; gpios = <ðphy3 0 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts index a646ec3358..cdb0093217 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -69,12 +70,14 @@ compatible = "gpio-leds"; led_run: blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; white { - label = "white:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts index 3f3e7cf683..5fc97d7bb2 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-ap1300.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -91,13 +92,15 @@ compatible = "gpio-leds"; led_power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; default-state = "on"; }; wan { - label = "white:wan"; + function = LED_FUNCTION_WAN; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts index c8868d8b30..fa3ed8b054 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts @@ -4,6 +4,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -100,7 +101,8 @@ compatible = "gpio-leds"; power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; default-state = "keep"; panic-indicator; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts index 1fbc02d62b..501aed5467 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> / { model = "devolo Magic 2 WiFi next"; @@ -73,7 +74,8 @@ }; status_wlan { - label = "white:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; default-state = "keep"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts index 62ba76802d..cab34b5a6c 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts @@ -3,6 +3,8 @@ * Author: Robert Marko <robert@meshpoint.me> */ +#include <dt-bindings/leds/common.h> + #include "qcom-ipq4018-jalapeno.dtsi" / { @@ -74,7 +76,8 @@ compatible = "gpio-leds"; led_status: status { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 63 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts index ff7252d696..a9e9683592 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/input/linux-event-codes.h> #include <dt-bindings/soc/qcom,tcsr.h> @@ -130,12 +131,14 @@ pinctrl-names = "default"; power: power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; usb { - label = "green:usb"; + function = LED_FUNCTION_USB; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; @@ -152,7 +155,8 @@ }; wps { - label = "green:wps"; + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts index 30511e3886..f23b58a3f4 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-pa1200.dts @@ -6,6 +6,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -78,17 +79,20 @@ compatible = "gpio-leds"; led_status_cyan: status_cyan { - label = "cyan:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_CYAN>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; led_status_purple: status_purple { - label = "purple:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_PURPLE>; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; led_status_yellow: status_yellow { - label = "yellow:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_YELLOW>; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts index de3fa96922..252f9ad71a 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts @@ -4,6 +4,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -81,7 +82,8 @@ compatible = "gpio-leds"; power { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; default-state = "keep"; panic-indicator; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dtsi index 777f46e3af..2b357a1f03 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wap-ac.dtsi @@ -4,6 +4,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -62,7 +63,8 @@ compatible = "gpio-leds"; power { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts index efb267ae36..7ce0b9e359 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts @@ -18,6 +18,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -75,7 +76,8 @@ compatible = "gpio-leds"; wps { - label = "green:wps"; + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; @@ -85,7 +87,8 @@ }; power: power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts index 369b5475d0..39a52a7c48 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts @@ -6,6 +6,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -78,17 +79,20 @@ compatible = "gpio-leds"; status_red { - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; }; led_status_green: status_green { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; }; status_blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts index 523fe4e501..d1c8d798f9 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -118,7 +119,8 @@ compatible = "gpio-leds"; usb { - label = "blue:usb"; + function = LED_FUNCTION_USB; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>; linux,default-trigger = "usbport"; trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; @@ -130,7 +132,8 @@ }; wan { - label = "blue:wan"; + function = LED_FUNCTION_WAN; + color = <LED_COLOR_ID_BLUE>; gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi index 9689bc566f..d226611311 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi @@ -7,6 +7,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -130,7 +131,8 @@ }; led3 { - label = "green:usb"; + function = LED_FUNCTION_USB; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 32 GPIO_ACTIVE_LOW>; trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts index 5a738da33d..1b9276ede2 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT +#include <dt-bindings/leds/common.h> + #include "qcom-ipq4019-xx8300.dtsi" / { @@ -34,12 +36,14 @@ }; led_wps: wps { - label = "white:wps"; + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; led_wps_amber: wps_amber { - label = "amber:wps"; + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_AMBER>; gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; panic-indicator; }; @@ -52,7 +56,8 @@ // On back panel, above USB socket led_usb: usb { - label = "green:usb"; + function = LED_FUNCTION_USB; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts index 63fd66901d..000acd196c 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> / { model = "EnGenius EAP2200"; @@ -29,7 +30,8 @@ compatible = "gpio-leds"; led_power: power { - label = "amber:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_AMBER>; gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts index 336da52f27..a118bdf26b 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -102,7 +103,8 @@ }; wlan { - label = "green:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 34 GPIO_ACTIVE_LOW>; }; @@ -112,12 +114,14 @@ }; power_green: power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; }; wps { - label = "green:wps"; + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 45 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts index 723f2161c6..7d683cdf65 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -73,17 +74,20 @@ compatible = "gpio-leds"; power_red: power_red { - label = "red:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; }; power_green: power_green { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; }; power_yellow { - label = "yellow:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_YELLOW>; gpios = <&tlmm 49 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts index 41dec72542..2555984384 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -81,7 +82,8 @@ }; power_led: power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 33 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts index 5cb5f7ca08..9f645dd657 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -84,7 +85,8 @@ compatible = "gpio-leds"; power_blue { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 57 GPIO_ACTIVE_HIGH>; default-state = "on"; }; @@ -93,7 +95,8 @@ gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>; }; power_white { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; }; internet_white { diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts index d5d00b2eef..26e9941a9f 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts @@ -4,6 +4,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -92,7 +93,8 @@ compatible = "gpio-leds"; led_status: status { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>; panic-indicator; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts index 6459fc3b92..52af1f125e 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts @@ -4,6 +4,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -73,23 +74,27 @@ compatible = "gpio-leds"; led_status_blue: status-blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; led_status_red: status-red { - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; panic-indicator; }; led_status_green: status-green { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; wlan { - label = "green:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>; }; @@ -99,7 +104,8 @@ }; wan { - label = "green:wan"; + function = LED_FUNCTION_WAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts index 35c4c26a2c..4e2b4574d3 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts @@ -4,6 +4,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -101,23 +102,27 @@ compatible = "gpio-leds"; led_status_blue: status-blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; led_status_red: status-red { - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; panic-indicator; }; led_status_green: status-green { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; wlan { - label = "green:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>; }; @@ -127,7 +132,8 @@ }; wan { - label = "green:wan"; + function = LED_FUNCTION_WAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-le1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-le1.dts index 677b4baa0f..c4e7d0b207 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-le1.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-le1.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -33,7 +34,8 @@ compatible = "gpio-leds"; led_usb: usb { - label = "green:usb"; + function = LED_FUNCTION_USB; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 36 GPIO_ACTIVE_LOW>; linux,default-trigger = "usbport"; trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts index 38bacfa2ba..4f0eaa625b 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts @@ -18,6 +18,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -95,7 +96,8 @@ compatible = "gpio-leds"; power: power { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; default-state = "keep"; panic-indicator; @@ -107,7 +109,8 @@ }; wlan { - label = "green:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts index 1b1a697f13..d965f2724d 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts @@ -43,20 +43,23 @@ }; led_power: led-1 { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; led-2 { function = LED_FUNCTION_WLAN; - label = "blue:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; led-3 { - label = "red:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts index 057aa88028..ab9a05c788 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT +#include <dt-bindings/leds/common.h> + #include "qcom-ipq4019-xx8300.dtsi" / { @@ -19,25 +21,29 @@ compatible = "gpio-leds"; led_red: red { - label = "red:alarm"; + function = LED_FUNCTION_ALARM; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>; }; led_amber: amber { - label = "amber:programming"; + function = LED_FUNCTION_PROGRAMMING; + color = <LED_COLOR_ID_AMBER>; gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; panic-indicator; }; led_blue: blue { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; // On back panel, above USB socket led_usb: usb { - label = "green:usb"; + function = LED_FUNCTION_USB; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi index 44dbfef529..849df64201 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -86,34 +87,40 @@ compatible = "gpio-leds"; led-0 { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 63 GPIO_ACTIVE_HIGH>; default-state = "on"; }; led-1 { - label = "red:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; panic-indicator; }; led_status_green: led-2 { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 53 GPIO_ACTIVE_HIGH>; }; led_status_red: led-3 { - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; }; led_status_blue: led-4 { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 57 GPIO_ACTIVE_HIGH>; }; led_status_white: led-5 { - label = "white:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts index 49d399ed1f..ed333c4990 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-pa2200.dts @@ -6,6 +6,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -66,7 +67,8 @@ compatible = "gpio-leds"; led_power_orange: power_orange { - label = "orange:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_ORANGE>; gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; }; @@ -89,7 +91,8 @@ }; led_status_blue: status_blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts index f746acfbb9..5604af2ddb 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rt-ac42u.dts @@ -106,7 +106,8 @@ color = <LED_COLOR_ID_BLUE>; function = LED_FUNCTION_STATUS; gpios = <&tlmm 40 GPIO_ACTIVE_LOW>; - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_BLUE>; }; led-1 { diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts index 6fce4ae87b..e2df1d1997 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts @@ -7,6 +7,7 @@ #include <dt-bindings/soc/qcom,tcsr.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> / { model = "Cell C RTL30VW"; @@ -48,13 +49,15 @@ led_power_blue: power_blue { gpios = <&led_gpio 0 GPIO_ACTIVE_HIGH>; - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; default-state = "on"; }; led_power_red: power_red { gpios = <&led_gpio 1 GPIO_ACTIVE_HIGH>; - label = "red:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_RED>; }; tp28 { @@ -83,7 +86,8 @@ wps { gpios = <&led_gpio 10 GPIO_ACTIVE_HIGH>; - label = "blue:wps"; + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_BLUE>; }; voip { diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts index 7d030c489d..00b5897b7d 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts @@ -6,6 +6,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/soc/qcom,tcsr.h> @@ -81,17 +82,20 @@ compatible = "gpio-leds"; led_power_white: power_white { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_WHITE>; gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>; }; led_power_orange: power_orange { - label = "orange:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_ORANGE>; gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; }; led_power_blue: power_blue { - label = "blue:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_BLUE>; gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi index 3de6a10433..fe3650ca58 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -98,7 +99,8 @@ pinctrl-names = "default"; led_status: status { - label = "green:status"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 68 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts index 9694973132..13ed26d5d6 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts @@ -17,6 +17,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -108,7 +109,8 @@ compatible = "gpio-leds"; power: power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; default-state = "on"; }; @@ -119,7 +121,8 @@ }; wlan { - label = "green:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts index 1a61b8161d..e7236824aa 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts @@ -3,6 +3,7 @@ #include "qcom-ipq4019.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/soc/qcom,tcsr.h> / { @@ -93,7 +94,8 @@ compatible = "gpio-leds"; led_power: power { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 57 GPIO_ACTIVE_HIGH>; default-state = "on"; }; @@ -104,7 +106,8 @@ }; wlan { - label = "green:wlan"; + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_GREEN>; gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi index dbf6c14b72..2b9f73eb24 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi @@ -102,7 +102,8 @@ compatible = "gpio-leds"; power_orange: power { - label = "orange:power"; + function = LED_FUNCTION_POWER; + color = <LED_COLOR_ID_ORANGE>; gpios = <&tlmm 49 GPIO_ACTIVE_LOW>; panic-indicator; }; |