mediatek: 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/mediatek/dts/mt7622-buffalo-wsr.dtsi b/target/linux/mediatek/dts/mt7622-buffalo-wsr.dtsi
index e77f83d354bb0c3411c31b7cdd14dfd22f9f3622..2f0540f4118a09445b0896d6ea836b2429c60429 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-buffalo-wsr.dtsi
+++ b/target/linux/mediatek/dts/mt7622-buffalo-wsr.dtsi
@@ -25,42 +25,36 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       label = "amber:wireless";
                        gpios = <&pio 2 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_WLAN;
                };
 
                power_amber: led-1 {
-                       label = "amber:power";
                        gpios = <&pio 3 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_AMBER>;
                        function = LED_FUNCTION_POWER;
                };
 
                power_green: led-2 {
-                       label = "green:power";
                        gpios = <&pio 4 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                };
 
                led-3 {
-                       label = "green:wireless";
                        gpios = <&pio 15 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN;
                };
 
                led-4 {
-                       label = "green:internet";
                        gpios = <&pio 19 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WAN;
                };
 
                led-5 {
-                       label = "green:router";
                        gpios = <&pio 20 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_INDICATOR;

diff --git a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
index c775d998181e287027e29360c9ca6b62f15c08a5..f3a688b2d684b437c39fdb19a5c3e7f9dcac873b 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
+++ b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
@@ -33,14 +33,12 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       label = "red:wps";
                        gpios = <&pio 47 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_WPS;
                };
 
                led_power_red: led-1 {
-                       label = "red:power";
                        gpios = <&pio 48 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_POWER;
@@ -48,7 +46,6 @@
                };
 
                led_power_green: led-2 {
-                       label = "green:power";
                        gpios = <&pio 49 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
@@ -56,7 +53,6 @@
                };
 
                led-3 {
-                       label = "blue:power";
                        gpios = <&pio 50 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_POWER;
@@ -64,7 +60,6 @@
                };
 
                led-4 {
-                       label = "white:wlan2g";
                        gpios = <&pio 85 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_WLAN;
@@ -73,7 +68,6 @@
                };
 
                led-5 {
-                       label = "white:wlan5g";
                        gpios = <&pio 89 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_WHITE>;
                        function = LED_FUNCTION_WLAN;

diff --git a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
index 7445b610dcc43342edb8e4bba1db8962c53bf3a6..6ff061b1e9cc8980adee4ea746ed0ed6c42ad9ff 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
+++ b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
@@ -38,21 +38,18 @@
                compatible = "gpio-leds";
 
                led_blue: blue {
-                       label = "blue:status";
                        gpios = <&pio 8 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led_red: red {
-                       label = "red:status";
                        gpios = <&pio 34 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led_green: green {
-                       label = "green:status";
                        gpios = <&pio 35 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;

diff --git a/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts b/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts
index 8f4dc23fb4b5949d9b45aca89c52a8a7c8d6c729..8b9c7a75477d6582da6ce063416fe9a6d291767b 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts
+++ b/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts
@@ -58,7 +58,6 @@
                };
 
                led_power: led-power {
-                       label = "blue:power"; // can be removed once #13837 is merged
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&pio 7 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
index 112fd777f05b519fa5b20f52ca085e0b0bf5f53a..de35d150980ef35b141a3ac014fd4d1f1b981431 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
@@ -52,28 +52,24 @@
                compatible = "gpio-leds";
 
                led_status_red: red {
-                       label = "red:status";
                        gpios = <&pio 9 GPIO_ACTIVE_HIGH>;
                        color = <LED_COLOR_ID_RED>;
                        function = LED_FUNCTION_STATUS;
                };
 
                led_status_green: green {
-                       label = "green:status";
                        gpios = <&pio 10 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_STATUS;
                };
 
                blue {
-                       label = "blue:status";
                        gpios = <&pio 11 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_STATUS;
                };
 
                4g {
-                       label = "blue:4g";
                        gpios = <&pio 8 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_USB;
@@ -81,7 +77,6 @@
                };
 
                4g2 {
-                       label = "blue:4g2";
                        gpios = <&pio 14 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_BLUE>;
                        function = LED_FUNCTION_USB;

diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
index ffa5acb5d3694ec630e9de0e0b1e84027d6145fc..30571965bc9e51e55175e194a87383eca9f7ff5e 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
@@ -202,13 +202,11 @@
 
                led_status_rgb: led@0 {
                        reg = <0>;
-                       label = "rgb:status";
                        color-index = <LED_COLOR_ID_RED LED_COLOR_ID_GREEN LED_COLOR_ID_BLUE>;
                };
 
                led_network_rgb: led@1 {
                        reg = <1>;
-                       label = "rgb:network";
                        color-index = <LED_COLOR_ID_RED LED_COLOR_ID_GREEN LED_COLOR_ID_BLUE>;
                };
        };