From: Christian Marangi Date: Wed, 7 Feb 2024 13:48:42 +0000 (+0100) Subject: qualcommax: drop redundant label with new LED color/function format X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2e659930d3f3e131b28879447d61faf58cf8add7;p=openwrt%2Fstaging%2Fjow.git qualcommax: 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/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts index 572812ec39..497a18714a 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts @@ -61,97 +61,81 @@ pinctrl-names = "default"; led_system_green: led-system-green { - label = "green:system"; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; color = ; }; led_system_red: led-system-red { - label = "red:system"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; color = ; }; led_pwr_green: led-pwr-green { - label = "green:pwr"; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; color = ; }; led-wifi-green { - label = "green:wifi"; gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>; color = ; }; led-lan4-green { - label = "green:lan4"; gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>; color = ; }; led-lan4-amber { - label = "amber:lan4"; gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>; color = ; }; led-lan3-green { - label = "green:lan3"; gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>; color = ; }; led-lan3-amber { - label = "amber:lan3"; gpios = <&tlmm 11 GPIO_ACTIVE_HIGH>; color = ; }; led-lan2-green { - label = "green:lan2"; gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>; color = ; }; led-lan2-amber { - label = "amber:lan2"; gpios = <&tlmm 13 GPIO_ACTIVE_HIGH>; color = ; }; led-lan1-green { - label = "green:lan1"; gpios = <&tlmm 14 GPIO_ACTIVE_HIGH>; color = ; }; led-lan1-amber { - label = "amber:lan1"; gpios = <&tlmm 15 GPIO_ACTIVE_HIGH>; color = ; }; led-10g-1-green { - label = "green:10g_1"; gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; color = ; }; led-10g-1-amber { - label = "amber:10g_1"; gpios = <&tlmm 56 GPIO_ACTIVE_HIGH>; color = ; }; led-10g-2-green { - label = "green:10g_2"; gpios = <&tlmm 51 GPIO_ACTIVE_HIGH>; color = ; }; led-10g-2-amber { - label = "amber:10g_2"; gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>; color = ; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts index 7133969d35..5364daad45 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts @@ -48,20 +48,17 @@ compatible = "gpio-leds"; led_system: system { - label = "system"; color = "red"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; wlan2g { - label = "wlan2g"; color = "green"; linux,default-trigger = "phy0tpt"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; wlan5g { - label = "wlan5g"; color = "blue"; linux,default-trigger = "phy1tpt"; gpios = <&tlmm 9 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts index 0ebdeb8194..d6be71b8cf 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts @@ -48,45 +48,38 @@ compatible = "gpio-leds"; led_system_blue: system-blue { - label = "blue:system"; gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>; color = ; }; led_system_yellow: system-yellow { - label = "yellow:system"; gpios = <&tlmm 52 GPIO_ACTIVE_HIGH>; color = ; }; network-yellow { - label = "yellow:network"; gpios = <&tlmm 50 GPIO_ACTIVE_HIGH>; color = ; }; network-blue { - label = "blue:network"; gpios = <&tlmm 51 GPIO_ACTIVE_HIGH>; color = ; }; top-red { - label = "red:top"; gpios = <&tlmm 63 GPIO_ACTIVE_HIGH>; color = ; default-state = "keep"; }; top-green { - label = "green:top"; gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; color = ; default-state = "keep"; }; top-blue { - label = "blue:top"; gpios = <&tlmm 66 GPIO_ACTIVE_HIGH>; color = ; default-state = "keep"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts index 3dec53f156..66a14232d7 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts @@ -54,13 +54,11 @@ compatible = "gpio-leds"; led_system_blue: system-blue { - label = "blue:system"; gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>; color = ; }; led_system_red: system-red { - label = "red:system"; gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; color = ; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts index a450fbca25..e4bd72c532 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts @@ -47,31 +47,26 @@ compatible = "gpio-leds"; led_power_red: power-red { - label = "red:power"; gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>; color = ; }; led_power_blue: power-blue { - label = "blue:power"; gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; color = ; }; led_system_red: system-red { - label = "red:system"; gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; color = ; }; led_system_green: system-green { - label = "green:system"; gpios = <&tlmm 18 GPIO_ACTIVE_HIGH>; color = ; }; led_system_blue: system-blue { - label = "blue:system"; gpios = <&tlmm 19 GPIO_ACTIVE_HIGH>; color = ; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts index 0949d19171..39e0cfabf7 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts @@ -72,63 +72,53 @@ compatible = "gpio-leds"; led_system_white: system-white { - label = "white:system"; gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>; color = ; }; led_24g_white { - label = "white:24g"; gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>; color = ; linux,default-trigger = "phy1radio"; }; led_5g_white { - label = "white:5g"; gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>; color = ; linux,default-trigger = "phy0radio"; }; led_usb1_white { - label = "white:usb1"; gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>; color = ; }; led_usb2_white { - label = "white:usb2"; gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>; color = ; }; led_wan_white: wan-white { - label = "white:wan"; gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>; color = ; }; led_aqr_green { - label = "green:aqr"; gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>; color = ; }; led_aqr_red { - label = "red:aqr"; gpios = <&led_gpio 10 GPIO_ACTIVE_LOW>; color = ; }; led_aqr_white { - label = "white:aqr"; gpios = <&led_gpio 11 GPIO_ACTIVE_LOW>; color = ; }; led_wps_white { - label = "white:wps"; gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>; color = ; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts index 325a391ca0..aefa9e3b9b 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts @@ -31,52 +31,44 @@ compatible = "gpio-leds"; led-0 { - label = "white:router"; gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; color = ; }; led-1 { - label = "red:router"; gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; color = ; }; led_power_red: led-2 { - label = "red:power"; gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_POWER; }; led_power_white: led-3 { - label = "white:power"; gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_POWER; }; led-4 { - label = "white:internet"; gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; color = ; }; led-5 { - label = "red:internet"; gpios = <&tlmm 44 GPIO_ACTIVE_HIGH>; color = ; }; led-6 { - label = "red:wireless"; gpios = <&tlmm 55 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_WLAN; }; led-7 { - label = "white:wireless"; gpios = <&tlmm 56 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_WLAN;