From 4589fa38c56a9863546fa852b737ef1cfdbf4b08 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 7 Feb 2024 14:48:40 +0100 Subject: [PATCH] mpc85xx: convert to new LED color/function format where possible Initial conversion to new LED color/function format and drop label format where possible. The same label is composed at runtime. Signed-off-by: Christian Marangi --- .../mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts | 4 +++- .../mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts | 7 +++++-- .../mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts index 89d8afe463a4..087138bbc2fc 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later or MIT #include +#include #include /include/ "fsl/p1010si-pre.dtsi" @@ -36,7 +37,8 @@ status_red { gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; - label = "red:status"; + function = LED_FUNCTION_STATUS; + color = ; }; led_mode: mode_green { diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts index 764c8a31c8ae..5d214e38a4e9 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts @@ -2,6 +2,7 @@ #include #include +#include /include/ "fsl/p1010si-pre.dtsi" @@ -42,12 +43,14 @@ led_power_green: power_green { gpios = <&spi_gpio 0 GPIO_ACTIVE_HIGH>; - label = "green:power"; + function = LED_FUNCTION_POWER; + color = ; }; led_power_red: power_red { gpios = <&spi_gpio 1 GPIO_ACTIVE_HIGH>; - label = "red:power"; + function = LED_FUNCTION_POWER; + color = ; }; lan1_red { diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts index bdc5e81df28c..30fae7f7d6a1 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts +++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3825i.dts @@ -4,6 +4,7 @@ #include #include +#include / { model = "Extreme Networks WS-AP3825i"; @@ -47,12 +48,14 @@ led_power_green: power_green { gpios = <&spi_gpio 0 GPIO_ACTIVE_HIGH>; - label = "green:power"; + function = LED_FUNCTION_POWER; + color = ; }; led_power_red: power_red { gpios = <&spi_gpio 1 GPIO_ACTIVE_HIGH>; - label = "red:power"; + function = LED_FUNCTION_POWER; + color = ; }; lan1_red { -- 2.30.2