From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 7 Feb 2024 13:48:41 +0000 (+0100)
Subject: mvebu: convert to new LED color/function format where possible
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0b8746ec109163289c76d1e62a6aeafc44bba905;p=openwrt%2Fstaging%2Fjow.git

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 494487a8b4..f1fd72a93c 100644
--- 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 22dcbfac35..07400fce3a 100644
--- 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 5bc3a846e0..a33f8394ca 100644
--- 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 671b592e67..4b153fdc8c 100644
--- 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";
 			};