mvebu: 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/mvebu/files/arch/arm/boot/dts/armada-385-nas1dual.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-nas1dual.dts
index 494487a8b410b2410b54b52e53234adb4ad74a40..f1fd72a93c961ca7e6b3585fdf912970af9734f5 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-nas1dual.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-nas1dual.dts
@@ -12,6 +12,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include "armada-385.dtsi"
 
 / {
@@ -86,7 +87,8 @@
                };
 
                usb {
-                       label = "blue:usb";
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
                        trigger-sources = <&usb3_0_port1 &usb3_0_port2>;
                        linux,default-trigger = "usbport";

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
index 22dcbfac35fe0401c9a12e967b0bfe7c866f8974..07400fce3ae33642e46af25ef2fd325cedd023c7 100644 (file)
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
@@ -3,6 +3,7 @@
 /dts-v1/;
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include "armada-372x.dtsi"
 
 / {
@@ -63,12 +64,14 @@
                };
 
                wan {
-                       label = "green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9131-puzzle-m901.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9131-puzzle-m901.dts
index 5bc3a846e0d5f836666262c0a18406437287f6e4..a33f8394ca649c8d1ab587aae9640990447e2063 100644 (file)
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9131-puzzle-m901.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9131-puzzle-m901.dts
@@ -10,6 +10,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "iEi Puzzle-M901";
@@ -96,7 +97,8 @@
 
                        led_power: led@3 {
                                reg = <3>;
-                               label = "yellow:power";
+                               function = LED_FUNCTION_POWER;
+                               color = <LED_COLOR_ID_YELLOW>;
                                active-low;
                                default-state = "on";
                        };

diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9132-puzzle-m902.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9132-puzzle-m902.dts
index 671b592e67a744a721c49910c7ed680dbf2a61d6..4b153fdc8c483e560954275c1c767c0badc46cfd 100644 (file)
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9132-puzzle-m902.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9132-puzzle-m902.dts
@@ -10,6 +10,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "iEi Puzzle-M902";
@@ -141,7 +142,8 @@
 
                        led_power: led@3 {
                                reg = <3>;
-                               label = "yellow:power";
+                               function = LED_FUNCTION_POWER;
+                               color = <LED_COLOR_ID_YELLOW>;
                                active-low;
                                default-state = "on";
                        };