From: Christian Marangi Date: Wed, 7 Feb 2024 13:48:44 +0000 (+0100) Subject: realtek: drop redundant label with new LED color/function format X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f038c0c18fa454e05da03b48f8634269eacdceda;p=openwrt%2Fstaging%2Fblogic.git 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 --- 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 c1d72b880b19..b26ebb980681 100644 --- 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 = ; function = LED_FUNCTION_POWER; gpios = <&gpio1 32 GPIO_ACTIVE_LOW>; }; led_power_green: led-1 { - label = "green:power"; color = ; 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 599b2e3b51f7..f694ae3317c6 100644 --- 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 = ; function = LED_FUNCTION_STATUS; gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; }; led_status_green: led-1 { - label = "green:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio1 32 GPIO_ACTIVE_LOW>; }; led_status_blue: led-2 { - label = "blue:status"; color = ; 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 76653fa210da..335aff2cf046 100644 --- 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 = ; function = LED_FUNCTION_STATUS; gpios = <&gpio1 31 GPIO_ACTIVE_LOW>; }; led_status_green: led-1 { - label = "green:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio1 32 GPIO_ACTIVE_LOW>; }; led_status_blue: led-2 { - label = "blue:status"; color = ; 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 5cf3ca0c81a1..5d77cf8c364f 100644 --- 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 = ; function = LED_FUNCTION_POWER; gpios = <&gpio1 32 GPIO_ACTIVE_LOW>; }; led_power_green: led-1 { - label = "green:power"; color = ; 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 f9d58f5b66e6..bd59ff36f450 100644 --- 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 = ; 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 = ; 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 15120265c97c..de17958af197 100644 --- 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 = ; function = LED_FUNCTION_POWER; }; led-1 { - label = "red:loop"; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; color = ; 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 = ; }; 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 8ea28ed2fde4..49b55813f9d5 100644 --- 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 = ; 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 c3b29a87ff39..abbfd60085a6 100644 --- 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 = ; 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 = ; 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 1fa9d2cdc7f4..d01352ec560e 100644 --- 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 = ; 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 = ; 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 6e9f7baed063..d84987d209e2 100644 --- 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 = ; 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 6a7eb6eb8137..8e7d32de1c30 100644 --- 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 = ; 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 = ; 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 5ca342f970dd..4a19d83fdaf5 100644 --- 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 = ; function = LED_FUNCTION_INDICATOR; }; led-1 { - label = "green:poe"; gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_INDICATOR; }; led_sys: led-2 { - label = "green:sys"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_STATUS; }; led-3 { - label = "green:fan"; gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_STATUS; }; led-4 { - label = "amber:fan"; gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; color = ; function = "fault-fan"; }; led-5 { - label = "green:poe-max"; gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; color = ; 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 f04e98b9cfec..c08034b9581d 100644 --- 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 = ; function = LED_FUNCTION_FAULT; }; led-1 { - label = "green:giga"; gpios = <&gpio2 8 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_INDICATOR; @@ -33,7 +31,6 @@ }; led-2 { - label = "green:100m"; gpios = <&gpio2 9 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_INDICATOR; @@ -41,7 +38,6 @@ }; led-3 { - label = "green:full"; gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_INDICATOR; @@ -49,7 +45,6 @@ }; led-4 { - label = "green:loop_history"; gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; color = ; 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 c9a9e8f2c1db..fd139c9adaf9 100644 --- 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 = ; function = LED_FUNCTION_POWER; gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;