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>
This commit is contained in:
Christian Marangi 2024-02-07 14:48:37 +01:00
parent a9e0d97e1f
commit 33e7962329
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
21 changed files with 137 additions and 57 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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>;
};
*/

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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