From 33e796232911eb9e88d54b36669b4607819db65a Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 7 Feb 2024 14:48:37 +0100 Subject: [PATCH] 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 --- .../arm/boot/dts/qcom-ipq8062-wg2600hp3.dts | 6 ++++-- .../arch/arm/boot/dts/qcom-ipq8064-ad7200.dts | 17 ++++++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 17 ++++++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 16 +++++++++++----- .../arm/boot/dts/qcom-ipq8064-ea7500-v1.dts | 5 ++++- .../arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 8 ++++++-- .../arch/arm/boot/dts/qcom-ipq8064-fap-421e.dts | 3 ++- .../arch/arm/boot/dts/qcom-ipq8064-g10.dts | 13 +++++++++---- .../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 16 +++++++++++----- .../arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 13 +++++++++---- .../arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 13 +++++++++---- .../arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 7 +++++-- .../arch/arm/boot/dts/qcom-ipq8064-wpq864.dts | 4 +++- .../arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 7 +++++-- .../arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 4 +++- .../arm/boot/dts/qcom-ipq8065-nighthawk.dtsi | 16 +++++++++++----- .../arm/boot/dts/qcom-ipq8065-tr4400-v2.dts | 7 +++++-- .../arch/arm/boot/dts/qcom-ipq8068-ap3935.dts | 7 +++++-- .../arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts | 7 +++++-- .../arch/arm/boot/dts/qcom-ipq8068-mr42.dts | 4 +++- .../arch/arm/boot/dts/qcom-ipq8068-mr52.dts | 4 +++- 21 files changed, 137 insertions(+), 57 deletions(-) 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 0c669dcbfe62..76751910e01c 100644 --- 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 = ; gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>; }; led_power_red: power_red { - label = "red:power"; + function = LED_FUNCTION_POWER; + color = ; 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 f76e098d9e61..6e4c9bc773c8 100644 --- 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 + #include "qcom-ipq8064-ad7200-c2600.dtsi" / { @@ -57,7 +59,8 @@ pinctrl-names = "default"; lan { - label = "blue:lan"; + function = LED_FUNCTION_LAN; + color = ; gpios = <&qcom_pinmux 2 GPIO_ACTIVE_HIGH>; }; @@ -82,17 +85,20 @@ }; wan_orange { - label = "orange:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>; }; wan_blue { - label = "blue:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>; }; wps { - label = "blue:wps"; + function = LED_FUNCTION_WPS; + color = ; gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>; }; @@ -102,7 +108,8 @@ }; led_status: status { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = ; 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 cef1aba34445..33d8f78e58ac 100644 --- 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 = ; gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>; }; @@ -70,22 +71,26 @@ }; wps { - label = "white:wps"; + function = LED_FUNCTION_WPS; + color = ; gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; }; wan_amber { - label = "amber:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>; }; wan_white { - label = "white:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>; }; power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; @@ -116,4 +121,6 @@ bias-pull-up; }; }; +#include + }; 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 3cd1bd204529..8077c3a09012 100644 --- 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 +#include / { model = "Netgear Nighthawk X4 D7800"; @@ -77,22 +78,26 @@ }; power_amber: power_amber { - label = "amber:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; }; wan_white { - label = "white:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; }; wan_amber { - label = "amber:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; }; wps { - label = "white:wps"; + function = LED_FUNCTION_WPS; + color = ; gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; }; @@ -102,7 +107,8 @@ }; power_white: power_white { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; 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 aab44ea9e318..2a565cc2db25 100644 --- 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 + #include "qcom-ipq8064-eax500.dtsi" / { @@ -51,7 +53,8 @@ pinctrl-names = "default"; led_power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; 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 bc3a2c304964..036485ecc607 100644 --- 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 = ; gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; }; led_power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; 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 + }; 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 1902a2f996e4..bb66c6c80831 100644 --- 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 = ; 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 efcb6ec24110..24273291cb1e 100644 --- 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 +#include #include / { @@ -34,17 +35,20 @@ */ status_yellow { - label = "yellow:status"; + function = LED_FUNCTION_STATUS; + color = ; gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; }; led_status_amber: status_amber { - label = "amber:status"; + function = LED_FUNCTION_STATUS; + color = ; gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; }; led_status_blue: status_blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = ; 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 = ; 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 41360b4a55b5..c2703b05d786 100644 --- 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 +#include #include / { @@ -81,22 +82,26 @@ }; power_amber: power_amber { - label = "amber:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; }; wan_white { - label = "white:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; }; wan_amber { - label = "amber:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; }; wps { - label = "white:wps"; + function = LED_FUNCTION_WPS; + color = ; gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; }; @@ -106,7 +111,8 @@ }; power_white: power_white { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; 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 88c0daab4049..6c52d51ebc17 100644 --- 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 +#include / { model = "Netgear Nighthawk X4 R7500v2"; @@ -77,7 +78,8 @@ }; status { - label = "amber:status"; + function = LED_FUNCTION_STATUS; + color = ; gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; }; @@ -87,12 +89,14 @@ }; wan { - label = "white:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; }; wps { - label = "white:wps"; + function = LED_FUNCTION_WPS; + color = ; gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>; }; @@ -102,7 +106,8 @@ }; power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; 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 ac62470df482..62530efeb1f2 100644 --- 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 +#include / { model = "TP-Link Archer VR2600v"; @@ -77,12 +78,14 @@ }; usb { - label = "white:usb"; + function = LED_FUNCTION_USB; + color = ; gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>; }; lan { - label = "white:lan"; + function = LED_FUNCTION_LAN; + color = ; gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; }; @@ -97,7 +100,8 @@ }; power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; @@ -108,7 +112,8 @@ }; wan { - label = "white:wan"; + function = LED_FUNCTION_WAN; + color = ; 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 a376eb0e2fe9..0afc9219c9cf 100644 --- 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 +#include / { model = "NEC Aterm WG2600HP"; @@ -71,7 +72,8 @@ }; power_red: power_red { - label = "red:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; }; @@ -86,7 +88,8 @@ }; power_green: power_green { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = ; 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 f8b20b0635f2..0fb7e0531d52 100644 --- 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 +#include #include / { @@ -63,7 +64,8 @@ }; usb { - label = "green:usb"; + function = LED_FUNCTION_USB; + color = ; 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 d484ba9c6036..58074258306f 100644 --- 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 +#include / { model = "Buffalo WXR-2533DHP"; @@ -30,7 +31,8 @@ pinctrl-names = "default"; usb { - label = "green:usb"; + function = LED_FUNCTION_USB; + color = ; 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 = ; 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 db5acd47d749..7d22b4f54155 100644 --- 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 +#include / { model = "ZyXEL NBG6817"; @@ -68,7 +69,8 @@ }; power: power { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; 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 902df23501e7..a7f0b1dbf034 100644 --- 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 +#include / { memory@0 { @@ -71,23 +72,27 @@ pinctrl-names = "default"; power_white: power_white { - label = "white:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>; default-state = "keep"; }; power_amber: power_amber { - label = "amber:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>; }; wan_white { - label = "white:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>; }; wan_amber { - label = "amber:wan"; + function = LED_FUNCTION_WAN; + color = ; gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>; }; @@ -97,7 +102,8 @@ }; wps { - label = "white:wps"; + function = LED_FUNCTION_WPS; + color = ; 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 0e63ddaa7aae..8818e95e8d1b 100644 --- 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 +#include / { model = "Arris TR4400 v2"; @@ -51,12 +52,14 @@ pinctrl-names = "default"; led_status_red: status_red { - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = ; gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>; }; led_status_blue: status_blue { - label = "blue:status"; + function = LED_FUNCTION_STATUS; + color = ; 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 6d473d43ab12..0c865ef7c7cf 100644 --- 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 +#include #include / { @@ -52,12 +53,14 @@ pinctrl-names = "default"; led_power_green: power_green { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 22 GPIO_ACTIVE_LOW>; }; led_power_orange: power_orange { - label = "orange:power"; + function = LED_FUNCTION_POWER; + color = ; 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 50c1d37c2928..9f6c5fb69697 100644 --- 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 +#include #include / { @@ -67,7 +68,8 @@ pinctrl-names = "default"; led_power_green: power_green { - label = "green:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>; }; @@ -87,7 +89,8 @@ }; led_power_red: power_red { - label = "red:power"; + function = LED_FUNCTION_POWER; + color = ; 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 d9d284fcfaf9..7ec11de56b63 100644 --- 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 +#include / { model = "Meraki MR42"; @@ -38,7 +39,8 @@ pinctrl-names = "default"; led_power: power { - label = "orange:power"; + function = LED_FUNCTION_POWER; + color = ; 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 522fa12fd977..7512bfb74f1c 100644 --- 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 +#include / { model = "Meraki MR52"; @@ -40,7 +41,8 @@ pinctrl-names = "default"; led_power: power { - label = "orange:power"; + function = LED_FUNCTION_POWER; + color = ; gpios = <&qcom_pinmux 19 GPIO_ACTIVE_HIGH>; }; -- 2.30.2