From: Christian Marangi Date: Wed, 7 Feb 2024 13:48:34 +0000 (+0100) Subject: ath79: drop redundant label with new LED color/function format X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e92632f760a9db733ee05a3eef5ebaa45e167343;p=openwrt%2Fstaging%2Fnbd.git ath79: 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/ath79/dts/ar9344_embeddedwireless_balin.dts b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts index de13865818..a5d684cf99 100644 --- a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts +++ b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts @@ -25,7 +25,6 @@ compatible = "gpio-leds"; led_system: led-0 { - label = "green:system"; color = ; function = LED_FUNCTION_POWER; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts b/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts index d2c5171402..01b1053142 100644 --- a/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts +++ b/target/linux/ath79/dts/ar9344_moxa_awk-1137c.dts @@ -34,7 +34,6 @@ pinctrl-names = "default"; led_status_green: led-0 { - label = "green:status"; color = ; function = LED_FUNCTION_STATUS; function-enumerator = <0>; @@ -42,7 +41,6 @@ }; led_status_red: led-1 { - label = "red:status"; color = ; function = LED_FUNCTION_STATUS; function-enumerator = <1>; @@ -50,7 +48,6 @@ }; led-2 { - label = "green:wifi"; color = ; function = LED_FUNCTION_WLAN; function-enumerator = <0>; @@ -59,21 +56,18 @@ }; led-3 { - label = "green:lan1"; color = ; function = LED_FUNCTION_WAN; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; led-4 { - label = "green:lan2"; color = ; function = LED_FUNCTION_LAN; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; led-5 { - label = "yellow:wifi"; color = ; function = LED_FUNCTION_WLAN; function-enumerator = <1>; diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts index 3c0e9c56a1..c7149953be 100644 --- a/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts +++ b/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts @@ -24,7 +24,6 @@ }; led_power: led-1 { - label = "blue:power"; color = ; function = LED_FUNCTION_POWER; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts b/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts index 414db556ca..64f5eabb52 100644 --- a/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts +++ b/target/linux/ath79/dts/qca9531_letv_lba-047-ch.dts @@ -33,21 +33,18 @@ compatible = "gpio-leds"; led_status_blue: led-0 { - label = "blue:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_status_green: led-1 { - label = "green:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; led_status_red: led-2 { - label = "red:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts index d4bf64ab40..6ade40bfe1 100644 --- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts +++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts @@ -32,14 +32,12 @@ compatible = "gpio-leds"; led_power_amber: power-amber { - label = "amber:power"; color = ; function = LED_FUNCTION_POWER; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; led_power_green: power-green { - label = "green:power"; color = ; function = LED_FUNCTION_POWER; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/qca9557_meraki_mr18.dts b/target/linux/ath79/dts/qca9557_meraki_mr18.dts index a88e2bcd37..9189c6e551 100644 --- a/target/linux/ath79/dts/qca9557_meraki_mr18.dts +++ b/target/linux/ath79/dts/qca9557_meraki_mr18.dts @@ -66,17 +66,14 @@ #else red { - label = "red:tricolor"; color = ; }; green: green { - label = "green:tricolor"; color = ; }; blue { - label = "blue:tricolor"; color = ; }; #endif diff --git a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts index e5c2cbcb72..137bff732c 100644 --- a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts +++ b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts @@ -46,7 +46,6 @@ }; led_power: led-1 { - label = "green:power"; color = ; function = LED_FUNCTION_POWER; gpios = <&gpio 21 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts b/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts index ee2e82ef10..0f3c23d474 100644 --- a/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts +++ b/target/linux/ath79/dts/qca9558_jjplus_jwap230.dts @@ -21,7 +21,6 @@ compatible = "gpio-leds"; led_power: led-0 { - label = "green:power"; color = ; function = LED_FUNCTION_POWER; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts index 164e0802f9..f067df0fb7 100644 --- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts +++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a3.dts @@ -20,7 +20,6 @@ compatible = "gpio-leds"; led_power: power { - label = "green:power"; color = ; function = LED_FUNCTION_POWER; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts index 9d06a49626..a660c1593c 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts @@ -18,7 +18,6 @@ compatible = "gpio-leds"; led_status_green: led-0 { - label = "green:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; @@ -26,14 +25,12 @@ }; led_status_amber: led-1 { - label = "amber:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio 9 GPIO_ACTIVE_HIGH>; }; led_status_red: led-2 { - label = "red:status"; color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/ath79/dts/qca9563_zte_mf281.dts b/target/linux/ath79/dts/qca9563_zte_mf281.dts index 8fcd093d66..d0693658a4 100644 --- a/target/linux/ath79/dts/qca9563_zte_mf281.dts +++ b/target/linux/ath79/dts/qca9563_zte_mf281.dts @@ -16,7 +16,6 @@ }; &led_debug { - label = "green:debug"; color = ; }; diff --git a/target/linux/ath79/dts/qca9563_zte_mf282.dts b/target/linux/ath79/dts/qca9563_zte_mf282.dts index 439cc1af4a..12c8f00d1f 100644 --- a/target/linux/ath79/dts/qca9563_zte_mf282.dts +++ b/target/linux/ath79/dts/qca9563_zte_mf282.dts @@ -28,7 +28,6 @@ }; &led_debug { - label = "blue:debug"; color = ; };