From 3cd1250c95fa95c932651f1bb31baf9162101bd3 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 7 Feb 2024 14:48:39 +0100 Subject: [PATCH] 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 --- target/linux/mediatek/dts/mt7622-buffalo-wsr.dtsi | 6 ------ target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts | 6 ------ target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts | 3 --- target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts | 1 - target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts | 5 ----- .../mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi | 2 -- 6 files changed, 23 deletions(-) diff --git a/target/linux/mediatek/dts/mt7622-buffalo-wsr.dtsi b/target/linux/mediatek/dts/mt7622-buffalo-wsr.dtsi index e77f83d354..2f0540f411 100644 --- 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 = ; function = LED_FUNCTION_WLAN; }; power_amber: led-1 { - label = "amber:power"; gpios = <&pio 3 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_POWER; }; power_green: led-2 { - label = "green:power"; gpios = <&pio 4 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_POWER; }; led-3 { - label = "green:wireless"; gpios = <&pio 15 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_WLAN; }; led-4 { - label = "green:internet"; gpios = <&pio 19 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_WAN; }; led-5 { - label = "green:router"; gpios = <&pio 20 GPIO_ACTIVE_HIGH>; color = ; 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 c775d99818..f3a688b2d6 100644 --- 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 = ; function = LED_FUNCTION_WPS; }; led_power_red: led-1 { - label = "red:power"; gpios = <&pio 48 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_POWER; @@ -48,7 +46,6 @@ }; led_power_green: led-2 { - label = "green:power"; gpios = <&pio 49 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_POWER; @@ -56,7 +53,6 @@ }; led-3 { - label = "blue:power"; gpios = <&pio 50 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_POWER; @@ -64,7 +60,6 @@ }; led-4 { - label = "white:wlan2g"; gpios = <&pio 85 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_WLAN; @@ -73,7 +68,6 @@ }; led-5 { - label = "white:wlan5g"; gpios = <&pio 89 GPIO_ACTIVE_HIGH>; color = ; 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 7445b610dc..6ff061b1e9 100644 --- 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 = ; function = LED_FUNCTION_STATUS; }; led_red: red { - label = "red:status"; gpios = <&pio 34 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_STATUS; }; led_green: green { - label = "green:status"; gpios = <&pio 35 GPIO_ACTIVE_LOW>; color = ; 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 8f4dc23fb4..8b9c7a7547 100644 --- 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 = ; 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 112fd777f0..de35d15098 100644 --- 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 = ; function = LED_FUNCTION_STATUS; }; led_status_green: green { - label = "green:status"; gpios = <&pio 10 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_STATUS; }; blue { - label = "blue:status"; gpios = <&pio 11 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_STATUS; }; 4g { - label = "blue:4g"; gpios = <&pio 8 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_USB; @@ -81,7 +77,6 @@ }; 4g2 { - label = "blue:4g2"; gpios = <&pio 14 GPIO_ACTIVE_LOW>; color = ; 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 ffa5acb5d3..30571965bc 100644 --- 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_network_rgb: led@1 { reg = <1>; - label = "rgb:network"; color-index = ; }; }; -- 2.30.2