qualcommax: drop redundant label with new LED color/function format

Drop redundant label with new LED color/function format declared.
This was needed previously when the new format wasn't supported by
leds.sh functions script. Now that is supported this property
can be removed in favor of the new format.

Signed-off-by: Christian Marangi <[email protected]>

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
index 572812ec393dcb3d142756092df7770700fdf654..497a18714a67ef6c8c73baf398283199fe38902b 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts
@@ -61,97 +61,81 @@
                pinctrl-names = "default";
 
                led_system_green: led-system-green {
-                       label = "green:system";
                        gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led_system_red: led-system-red {
-                       label = "red:system";
                        gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_pwr_green: led-pwr-green {
-                       label = "green:pwr";
                        gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-wifi-green {
-                       label = "green:wifi";
                        gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-lan4-green {
-                       label = "green:lan4";
                        gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-lan4-amber {
-                       label = "amber:lan4";
                        gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                };
 
                led-lan3-green {
-                       label = "green:lan3";
                        gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-lan3-amber {
-                       label = "amber:lan3";
                        gpios = <&tlmm 11 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                };
 
                led-lan2-green {
-                       label = "green:lan2";
                        gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-lan2-amber {
-                       label = "amber:lan2";
                        gpios = <&tlmm 13 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                };
 
                led-lan1-green {
-                       label = "green:lan1";
                        gpios = <&tlmm 14 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-lan1-amber {
-                       label = "amber:lan1";
                        gpios = <&tlmm 15 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                };
 
                led-10g-1-green {
-                       label = "green:10g_1";
                        gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-10g-1-amber {
-                       label = "amber:10g_1";
                        gpios = <&tlmm 56 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                };
 
                led-10g-2-green {
-                       label = "green:10g_2";
                        gpios = <&tlmm 51 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led-10g-2-amber {
-                       label = "amber:10g_2";
                        gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
index 7133969d35fc5309bf3b5c2ede5fbb90bc9049e0..5364daad4547410027ddf6c87da6d466fe07c1d9 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts
@@ -48,20 +48,17 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "system";
                        color = "red";
                        gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
                };
 
                wlan2g {
-                       label = "wlan2g";
                        color = "green";
                        linux,default-trigger = "phy0tpt";
                        gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
                };
 
                wlan5g {
-                       label = "wlan5g";
                        color = "blue";
                        linux,default-trigger = "phy1tpt";
                        gpios = <&tlmm 9 GPIO_ACTIVE_HIGH>;

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
index 0ebdeb81940c78ed8269001e9e1c8a5cad6a05b5..d6be71b8cfd9eb35651b051ef9da60d5ba824d59 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
@@ -48,45 +48,38 @@
                compatible = "gpio-leds";
 
                led_system_blue: system-blue {
-                       label = "blue:system";
                        gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                };
 
                led_system_yellow: system-yellow {
-                       label = "yellow:system";
                        gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_YELLOW>;
                };
 
                network-yellow {
-                       label = "yellow:network";
                        gpios = <&tlmm 50 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_YELLOW>;
                };
 
                network-blue {
-                       label = "blue:network";
                        gpios = <&tlmm 51 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                };
 
                top-red {
-                       label = "red:top";
                        gpios = <&tlmm 63 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        default-state = "keep";
                };
 
                top-green {
-                       label = "green:top";
                        gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        default-state = "keep";
                };
 
                top-blue {
-                       label = "blue:top";
                        gpios = <&tlmm 66 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                        default-state = "keep";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
index 3dec53f156af3ce0cda254bfdd38df6374b1ff21..66a14232d725badfc1a8ba9f0ca5180ea2dc527f 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts
@@ -54,13 +54,11 @@
                compatible = "gpio-leds";
 
                led_system_blue: system-blue {
-                       label = "blue:system";
                        gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                };
 
                led_system_red: system-red {
-                       label = "red:system";
                        gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
index a450fbca25ca5e36b4adc5305ba73319d89c7ce7..e4bd72c532c2686936f44cecfafc1accfb66dae7 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts
@@ -47,31 +47,26 @@
                compatible = "gpio-leds";
 
                led_power_red: power-red {
-                       label = "red:power";
                        gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_power_blue: power-blue {
-                       label = "blue:power";
                        gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                };
 
                led_system_red: system-red {
-                       label = "red:system";
                        gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_system_green: system-green {
-                       label = "green:system";
                        gpios = <&tlmm 18 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led_system_blue: system-blue {
-                       label = "blue:system";
                        gpios = <&tlmm 19 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
index 0949d19171a6cf01db43cbde29cf157f217d3b06..39e0cfabf707e4ff1ac7e8939cd3240d6feccd7a 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts
@@ -72,63 +72,53 @@
                compatible = "gpio-leds";
 
                led_system_white: system-white {
-                       label = "white:system";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_WHITE>;
                };
 
                led_24g_white {
-                       label = "white:24g";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_WHITE>;
                        linux,default-trigger = "phy1radio";
                };
 
                led_5g_white {
-                       label = "white:5g";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_WHITE>;
                        linux,default-trigger = "phy0radio";
                };
 
                led_usb1_white {
-                       label = "white:usb1";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_WHITE>;
                };
 
                led_usb2_white {
-                       label = "white:usb2";
                        gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_WHITE>;
                };
 
                led_wan_white: wan-white {
-                       label = "white:wan";
                        gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_WHITE>;
                };
 
                led_aqr_green {
-                       label = "green:aqr";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                };
 
                led_aqr_red {
-                       label = "red:aqr";
                        gpios = <&led_gpio 10 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_aqr_white {
-                       label = "white:aqr";
                        gpios = <&led_gpio 11 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_WHITE>;
                };
 
                led_wps_white {
-                       label = "white:wps";
                        gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                };

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
index 325a391ca0605eaeb03060508ba32c08a17b734a..aefa9e3b9b6ec8ae68519cec3ae0cbfa13aeda9d 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts
@@ -31,52 +31,44 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       label = "white:router";
                        gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                };
 
                led-1 {
-                       label = "red:router";
                        gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led_power_red: led-2 {
-                       label = "red:power";
                        gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_POWER;
                };
 
                led_power_white: led-3 {
-                       label = "white:power";
                        gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_POWER;
                };
 
                led-4 {
-                       label = "white:internet";
                        gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                };
 
                led-5 {
-                       label = "red:internet";
                        gpios = <&tlmm 44 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                };
 
                led-6 {
-                       label = "red:wireless";
                        gpios = <&tlmm 55 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_WLAN;
                };
 
                led-7 {
-                       label = "white:wireless";
                        gpios = <&tlmm 56 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_WLAN;