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 <ansuelsmth@gmail.com>

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 89d8afe463a4a12e07f8c57cbdbedeac886eca3f..087138bbc2fc62843f8bb07e62ce54d726bd8e66 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 
 /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_COLOR_ID_RED>;
                };
 
                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 764c8a31c8ae189405880abf71343af6b1c4b5a1..5d214e38a4e9681dfbe8a2f379b8b29c0cd22c37 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 /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_COLOR_ID_GREEN>;
                };
 
                led_power_red: power_red {
                        gpios = <&spi_gpio 1 GPIO_ACTIVE_HIGH>;
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                };
 
                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 bdc5e81df28c9cdf82777c363d8a8ac040bcda76..30fae7f7d6a11a963b1f517a08a312c62f07d37f 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        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_COLOR_ID_GREEN>;
                };
 
                led_power_red: power_red {
                        gpios = <&spi_gpio 1 GPIO_ACTIVE_HIGH>;
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                };
 
                lan1_red {