realtek: 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/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts
index c1d72b880b1948b328524ad75d66dd9c2ccf01eb..b26ebb980681e5545a20339c2e7afeb260edcaab 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts
@@ -19,14 +19,12 @@
                compatible = "gpio-leds";
 
                led_power_amber: led-0 {
-                       label = "amber:power";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio1 32 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: led-1 {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts
index 599b2e3b51f7c912a3539efd4975ab891ab9f21b..f694ae3317c6851938888010faa5698c08beac0d 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts
@@ -18,21 +18,18 @@
                compatible = "gpio-leds";
 
                led_status_red: led-0 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
                };
 
                led_status_green: led-1 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 32 GPIO_ACTIVE_LOW>;
                };
 
                led_status_blue: led-2 {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 34 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tup-v1.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tup-v1.dts
index 76653fa210dac12524133ea5f362c823f64971e1..335aff2cf04691406f889dd77539bcef5c5e9945 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tup-v1.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tup-v1.dts
@@ -18,21 +18,18 @@
                compatible = "gpio-leds";
 
                led_status_red: led-0 {
-                       label = "red:status";
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
                };
 
                led_status_green: led-1 {
-                       label = "green:status";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 32 GPIO_ACTIVE_LOW>;
                };
 
                led_status_blue: led-2 {
-                       label = "blue:status";
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                        gpios = <&gpio1 34 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts
index 5cf3ca0c81a1cac83db8170be4ef7191b916108c..5d77cf8c364fb856b0eaa430c982e319bcddc929 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts
@@ -19,14 +19,12 @@
                compatible = "gpio-leds";
 
                led_power_amber: led-0 {
-                       label = "amber:power";
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio1 32 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: led-1 {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/realtek/dts-5.15/rtl8380_panasonic_m8eg-pn28080k.dts b/target/linux/realtek/dts-5.15/rtl8380_panasonic_m8eg-pn28080k.dts
index f9d58f5b66e60e6fa5ed79543b0961dbdb35af24..bd59ff36f450d3095c4a38f035492ca579c4c6f1 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8380_panasonic_m8eg-pn28080k.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_panasonic_m8eg-pn28080k.dts
@@ -28,7 +28,6 @@
 
 &leds {
        led_status_eco_amber: led-5 {
-               label = "amber:status_eco";
                gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                color = <LED_COLOR_ID_AMBER>;
                function = LED_FUNCTION_STATUS;
@@ -36,7 +35,6 @@
        };
 
        led_status_eco_green: led-6 {
-               label = "green:status_eco";
                gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
                color = <LED_COLOR_ID_GREEN>;
                function = LED_FUNCTION_STATUS;

diff --git a/target/linux/realtek/dts-5.15/rtl8382_apresia_aplgs120gtss.dts b/target/linux/realtek/dts-5.15/rtl8382_apresia_aplgs120gtss.dts
index 15120265c97c335542fc16466b0fdff9287e4392..de17958af197585f015711f915c15546266d043f 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8382_apresia_aplgs120gtss.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_apresia_aplgs120gtss.dts
@@ -26,14 +26,12 @@
                compatible = "gpio-leds";
 
                led_power: led-0 {
-                       label = "green:pwr";
                        gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                };
 
                led-1 {
-                       label = "red:loop";
                        gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_FAULT;
@@ -41,7 +39,6 @@
 
                /* LED chip is soldered, but no hole on the case */
                led-2 {
-                       label = "green:unused";
                        gpios = <&gpio1 36 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                };

diff --git a/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts b/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts
index 8ea28ed2fde48b0a54485fc7ea97ea94ca9e9742..49b55813f9d50310b82adb6a94b1f0a2be1b138d 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_iodata_bsh-g24mb.dts
@@ -27,7 +27,6 @@
                compatible = "gpio-leds";
 
                led_sys_loop: led {
-                       label = "red:sys_loop";
                        gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;

diff --git a/target/linux/realtek/dts-5.15/rtl8382_panasonic_m16eg-pn28160k.dts b/target/linux/realtek/dts-5.15/rtl8382_panasonic_m16eg-pn28160k.dts
index c3b29a87ff390a1c51020cf2742708242aed1205..abbfd60085a6504db260fd65da8c64e2e73dcb0e 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8382_panasonic_m16eg-pn28160k.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_panasonic_m16eg-pn28160k.dts
@@ -42,7 +42,6 @@
 
 &leds {
        led_status_eco_amber: led-5 {
-               label = "amber:status_eco";
                gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                color = <LED_COLOR_ID_AMBER>;
                function = LED_FUNCTION_STATUS;
@@ -50,7 +49,6 @@
        };
 
        led_status_eco_green: led-6 {
-               label = "green:status_eco";
                gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
                color = <LED_COLOR_ID_GREEN>;
                function = LED_FUNCTION_STATUS;

diff --git a/target/linux/realtek/dts-5.15/rtl8382_panasonic_m24eg-pn28240k.dts b/target/linux/realtek/dts-5.15/rtl8382_panasonic_m24eg-pn28240k.dts
index 1fa9d2cdc7f475189dbdb111be8c32b14427aaf7..d01352ec560e7f602ac457acbd4248ab3d6e9efb 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8382_panasonic_m24eg-pn28240k.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_panasonic_m24eg-pn28240k.dts
@@ -42,7 +42,6 @@
 
 &leds {
        led_status_eco_amber: led-5 {
-               label = "amber:status_eco";
                gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
                color = <LED_COLOR_ID_AMBER>;
                function = LED_FUNCTION_STATUS;
@@ -50,7 +49,6 @@
        };
 
        led_status_eco_green: led-6 {
-               label = "green:status_eco";
                gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
                color = <LED_COLOR_ID_GREEN>;
                function = LED_FUNCTION_STATUS;

diff --git a/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts b/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts
index 6e9f7baed063d969bf03e355206c4a893732cf90..d84987d209e278a7d2588c034154a726245f0d29 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_tplink_t1600g-28ts-v3.dts
@@ -27,7 +27,6 @@
                compatible = "gpio-leds";
 
                led_sys: led-0 {
-                       label = "green:sys";
                        gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;

diff --git a/target/linux/realtek/dts-5.15/rtl8393_panasonic_m48eg-pn28480k.dts b/target/linux/realtek/dts-5.15/rtl8393_panasonic_m48eg-pn28480k.dts
index 6a7eb6eb8137b6b19538c9e335707e06403febcd..8e7d32de1c3094a21fcdeb2527286e98ace80c16 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8393_panasonic_m48eg-pn28480k.dts
+++ b/target/linux/realtek/dts-5.15/rtl8393_panasonic_m48eg-pn28480k.dts
@@ -152,7 +152,6 @@
 
 &leds {
        led_status_eco_amber: led-5 {
-               label = "amber:status_eco";
                gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_AMBER>;
                function = LED_FUNCTION_STATUS;
@@ -160,7 +159,6 @@
        };
 
        led_status_eco_green: led-6 {
-               label = "green:status_eco";
                gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                function = LED_FUNCTION_STATUS;

diff --git a/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts b/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
index 5ca342f970ddd314ce794f1444527556fce0f335..4a19d83fdaf525aaf6d0a4a6713c826c0ef5a0fe 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
+++ b/target/linux/realtek/dts-5.15/rtl8393_tplink_sg2452p-v4.dts
@@ -74,42 +74,36 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       label = "green:speed";
                        gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;
                };
 
                led-1 {
-                       label = "green:poe";
                        gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;
                };
 
                led_sys: led-2 {
-                       label = "green:sys";
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led-3 {
-                       label = "green:fan";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led-4 {
-                       label = "amber:fan";
                        gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                        function = "fault-fan";
                };
 
                led-5 {
-                       label = "green:poe-max";
                        gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = "alarm-poe";

diff --git a/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi b/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi
index f04e98b9cfec45afc4dba57f87f74ce8e6c45d72..c08034b9581db6946a63b19c07db7f77b74bf5e0 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl83xx_panasonic_mxxeg-pn28xx0k.dtsi
@@ -18,14 +18,12 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       label = "amber:any_col";
                        gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_FAULT;
                };
 
                led-1 {
-                       label = "green:giga";
                        gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;
@@ -33,7 +31,6 @@
                };
 
                led-2 {
-                       label = "green:100m";
                        gpios = <&gpio2 9 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;
@@ -41,7 +38,6 @@
                };
 
                led-3 {
-                       label = "green:full";
                        gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;
@@ -49,7 +45,6 @@
                };
 
                led-4 {
-                       label = "green:loop_history";
                        gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;

diff --git a/target/linux/realtek/dts-5.15/rtl9302_zyxel_xgs1250-12.dts b/target/linux/realtek/dts-5.15/rtl9302_zyxel_xgs1250-12.dts
index c9a9e8f2c1db66be0187e04cddf89d2931097823..fd139c9adaf9d3bb0df438b1fc3a59815bc5e674 100644 (file)
--- a/target/linux/realtek/dts-5.15/rtl9302_zyxel_xgs1250-12.dts
+++ b/target/linux/realtek/dts-5.15/rtl9302_zyxel_xgs1250-12.dts
@@ -46,7 +46,6 @@
                pinctrl-0 = <&pinmux_disable_sys_led>;
 
                led_pwr_sys: led-0 {
-                       label = "green:power";
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;