apm821xx: implement new LED label naming scheme

This patch updates all current APM82181 devices over to that
"new LED naming scheme". This includes many updates to the
device-tree:
	- dropped the deprecated, but beloved "label" property.
	- rename all DT leds node names to led-#.
	- add function and color properties.
	- utilized panic-indicator property.
	- dropped led- aliases (see below).

migration scripts for all devices are included.

For more information. See:
<https://www.kernel.org/doc/html/latest/leds/leds-class.html>

For the future: It looks like the color+function properties
won over the dt-alias / label. This will need to be wired up
into openwrt eventually. For APM821xx the situation is that
all devices have a dedicated power and fault indicator.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

7 files changed, 145 insertions, 100 deletions

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index 2f797f8352..e20d4f1fa9 100644
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -9,6 +9,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/leds/common.h>
 #include "apm82181.dtsi"
 
 / {
@@ -17,10 +18,6 @@
 
 	aliases {
 		serial0 = &UART1;
-		led-boot = &status;
-		led-failsafe = &failsafe;
-		led-running = &status;
-		led-upgrade = &status;
 	};
 
 	chosen {
@@ -128,38 +125,50 @@
 	leds {
 		compatible = "gpio-leds";
 
-		status: power-green {
-			label = "mr24:green:power";
+		led-0 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_POWER;
 			gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
 		};
 
-		failsafe: power-orange {
-			label = "mr24:orange:power";
+		led-1 {
+			color = <LED_COLOR_ID_AMBER>;
+			function = LED_FUNCTION_FAULT;
 			gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
+			panic-indicator;
 		};
 
-		lan {
-			label = "mr24:green:wan";
+		led-2 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WAN;
 			gpios = <&GPIO0 17 GPIO_ACTIVE_LOW>;
 		};
 
-		ssi-0 {
-			label = "mr24:green:wifi1";
+		led-3 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			function-enumerator = <0>;
 			gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
 		};
 
-		ssi-1 {
-			label = "mr24:green:wifi2";
+		led-4 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			function-enumerator = <1>;
 			gpios = <&GPIO0 22 GPIO_ACTIVE_LOW>;
 		};
 
-		ssi-2 {
-			label = "mr24:green:wifi3";
+		led-5 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			function-enumerator = <2>;
 			gpios = <&GPIO0 21 GPIO_ACTIVE_LOW>;
 		};
 
-		ssi-3 {
-			label = "mr24:green:wifi4";
+		led-6 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			function-enumerator = <3>;
 			gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index fd5464f8a1..06dfa07965 100644
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -9,6 +9,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/leds/common.h>
 #include "apm82181.dtsi"
 
 / {
@@ -17,10 +18,6 @@
 
 	aliases {
 		serial0 = &UART1;
-		led-boot = &status;
-		led-failsafe = &failsafe;
-		led-running = &status;
-		led-upgrade = &status;
 	};
 
 	chosen {
@@ -116,43 +113,56 @@
 	leds {
 		compatible = "gpio-leds";
 
-		status: power-green {
-			label = "mx60:green:power";
+		led-0 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_POWER;
 			gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
 		};
 
-		failsafe: power-orange {
-			label = "mx60:orange:power";
+		led-1 {
+			color = <LED_COLOR_ID_AMBER>;
+			function = LED_FUNCTION_FAULT;
 			gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
+			panic-indicator;
 		};
 
-		wan-green {
-			label = "mx60:green:wan";
+		led-2 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WAN;
 			gpios = <&GPIO0 17 GPIO_ACTIVE_LOW>;
 		};
 
-		wan-orange {
-			label = "mx60:orange:wan";
+		led-3 {
+			color = <LED_COLOR_ID_AMBER>;
+			function = LED_FUNCTION_WAN;
 			gpios = <&GPIO0 15 GPIO_ACTIVE_LOW>;
 		};
 
-		lan1 {
-			label = "mx60:green:lan1";
+		led-4 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <0>;
 			gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
 		};
 
-		lan2 {
-			label = "mx60:green:lan2";
+		led-5 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <1>;
 			gpios = <&GPIO0 21 GPIO_ACTIVE_LOW>;
 		};
 
-		lan3 {
-			label = "mx60:green:lan3";
+		led-6 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <2>;
 			gpios = <&GPIO0 22 GPIO_ACTIVE_LOW>;
 		};
 
-		lan4 {
-			label = "mx60:green:lan4";
+		led-7 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <3>;
 			gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/apm821xx/dts/netgear-wndap620.dts b/target/linux/apm821xx/dts/netgear-wndap620.dts
index d72aef4def..50e1d0cf17 100644
--- a/target/linux/apm821xx/dts/netgear-wndap620.dts
+++ b/target/linux/apm821xx/dts/netgear-wndap620.dts
@@ -10,13 +10,16 @@
 };
 
 &LEDS {
-	link1000 {
-		label = "wndap620:green:link1000";
+	led-5 {
+		function = LED_FUNCTION_LAN;
+		function-enumerator = <1>;
+		color = <LED_COLOR_ID_GREEN>;
 		gpios = <&GPIO0 9 GPIO_ACTIVE_HIGH>;
 	};
 
-	link100 {
-		label = "wndap620:amber:link100";
+	led-6 {
+		function = LED_FUNCTION_LAN;
+		color = <LED_COLOR_ID_AMBER>;
 		gpios = <&GPIO0 10 GPIO_ACTIVE_HIGH>;
 	};
 };
diff --git a/target/linux/apm821xx/dts/netgear-wndap660.dts b/target/linux/apm821xx/dts/netgear-wndap660.dts
index e9f45abe0e..f01d1b3be0 100644
--- a/target/linux/apm821xx/dts/netgear-wndap660.dts
+++ b/target/linux/apm821xx/dts/netgear-wndap660.dts
@@ -10,23 +10,31 @@
 };
 
 &LEDS {
-	lan1-link1000 {
-		label = "wndap660:green:lan1-link1000";
+	led-5 {
+		color = <LED_COLOR_ID_GREEN>;
+		function = LED_FUNCTION_LAN;
+		function-enumerator = <1>;
 		gpios = <&GPIO0 22 GPIO_ACTIVE_HIGH>;
 	};
 
-	lan1-link100 {
-		label = "wndap660:amber:lan1-link100";
+	led-6 {
+		color = <LED_COLOR_ID_AMBER>;
+		function = LED_FUNCTION_LAN;
+		function-enumerator = <0>;
 		gpios = <&GPIO0 23 GPIO_ACTIVE_HIGH>;
 	};
 
-	lan2-link1000 {
-		label = "wndap660:green:lan2-link1000";
+	led-7 {
+		color = <LED_COLOR_ID_GREEN>;
+		function = LED_FUNCTION_LAN;
+		function-enumerator = <2>;
 		gpios = <&GPIO0 9 GPIO_ACTIVE_HIGH>;
 	};
 
-	lan2-link100 {
-		label = "wndap660:amber:lan2-link100";
+	led-8 {
+		color = <LED_COLOR_ID_AMBER>;
+		function = LED_FUNCTION_LAN;
+		function-enumerator = <1>;
 		gpios = <&GPIO0 10 GPIO_ACTIVE_HIGH>;
 	};
 };
diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
index 88284d0237..910817e5ed 100644
--- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
+++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
@@ -3,15 +3,12 @@
  * Device Tree Source for Netgear WNDAP620 and WNDAP660
  */
 
+#include <dt-bindings/leds/common.h>
 #include "apm82181.dtsi"
 
 / {
 	aliases {
 		serial0 = &UART0;
-		led-boot = &status;
-		led-failsafe = &failsafe;
-		led-running = &status;
-		led-upgrade = &status;
 	};
 
 	chosen {
@@ -137,29 +134,37 @@
 	LEDS: leds {
 		compatible = "gpio-leds";
 
-		status: power {
-			label = "wndap6x0:green:power";
+		led-0 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_POWER;
 			gpios = <&GPIO0 18 GPIO_ACTIVE_HIGH>;
 		};
 
-		failsafe: test {
-			label = "wndap6x0:amber:test";
+		led-1 {
+			color = <LED_COLOR_ID_AMBER>;
+			function = LED_FUNCTION_FAULT;
 			gpios = <&GPIO0 17 GPIO_ACTIVE_HIGH>;
 			panic-indicator;
 		};
 
-		activity {
-			label = "wndap6x0:green:activity";
+		led-2 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_LAN;
+			function-enumerator = <0>;
 			gpios = <&GPIO0 21 GPIO_ACTIVE_HIGH>;
 		};
 
-		wlan2g {
-			label = "wndap6x0:green:wlan2g";
+		led-3 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			function-enumerator = <0>;
 			gpios = <&GPIO0 19 GPIO_ACTIVE_HIGH>;
 		};
 
-		wlan5g {
-			label = "wndap6x0:green:wlan5g";
+		led-4 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WLAN;
+			function-enumerator = <1>;
 			gpios = <&GPIO0 20 GPIO_ACTIVE_HIGH>;
 		};
 	};
@@ -216,4 +221,3 @@
 		read-only;
 	};
 };
-
diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index ad23e8b441..286eba203b 100644
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -7,8 +7,9 @@
 
 /dts-v1/;
 
-#include "apm82181.dtsi"
 #include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/leds/common.h>
+#include "apm82181.dtsi"
 
 / {
 	model = "Netgear WNDR4700/WNDR4720 Series";
@@ -16,10 +17,6 @@
 
 	aliases {
 		serial0 = &UART0;
-		led-boot = &status;
-		led-failsafe = &failsafe;
-		led-running = &status;
-		led-upgrade = &status;
 	};
 
 	chosen {
@@ -367,53 +364,63 @@
 
 	leds {
 		compatible = "gpio-leds";
-		status: power-green {
-			label = "wndr4700:green:power";
+
+		led-0 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_POWER;
 			gpios = <&GPIO0 8 GPIO_ACTIVE_HIGH>;
 		};
 
-		failsafe: power-orange {
-			label = "wndr4700:orange:power";
+		led-1 {
+			color = <LED_COLOR_ID_AMBER>;
+			function = LED_FUNCTION_FAULT;
 			gpios = <&GPIO0 9 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "panic";
+			panic-indicator;
 		};
 
-		usb-blue {
-			label = "wndr4700:blue:usb";
+		led-2 {
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_USB;
 			gpios = <&GPIO0 10 GPIO_ACTIVE_HIGH>;
 			trigger-sources = <&usb2_port 1>, <&usb2_port 2>,
 					  <&usb3_port 1>, <&usb3_port 2>;
 			linux,default-trigger = "usbport";
 		};
 
-		logo-white {
-			label = "wndr4700:white:logo";
+		led-3 {
+			color = <LED_COLOR_ID_WHITE>;
+			function = LED_FUNCTION_INDICATOR;
 			gpios = <&GPIO0 11 GPIO_ACTIVE_HIGH>;
 		};
 
-		wan-yellow {
-			label = "wndr4700:yellow:wan";
+		led-4 {
+			color = <LED_COLOR_ID_YELLOW>;
+			function = LED_FUNCTION_WAN;
 			gpios = <&GPIO0 3 GPIO_ACTIVE_HIGH>;
 		};
 
-		wan-green {
-			label = "wndr4700:green:wan";
+		led-5 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_WAN;
 			gpios = <&GPIO0 12 GPIO_ACTIVE_HIGH>;
 		};
 
-		hd-green {
-			label = "wndr4700:green:hd";
+		led-6 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_DISK;
 			gpios = <&GPIO0 14 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "disk-activity";
 		};
 
-		hd-red {
-			label = "wndr4700:red:hd";
+		led-7 {
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_DISK_ERR;
 			gpios = <&GPIO0 17 GPIO_ACTIVE_HIGH>;
 		};
 
-		wlan-blue {
-			label = "wndr4700:blue:wlan";
+		led-8 {
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_WLAN;
 			gpios = <&GPIO0 18 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/apm821xx/dts/wd-mybooklive.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts
index bccf82fbaa..c96e7f75e9 100644
--- a/target/linux/apm821xx/dts/wd-mybooklive.dts
+++ b/target/linux/apm821xx/dts/wd-mybooklive.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 
+#include <dt-bindings/leds/common.h>
 #include "apm82181.dtsi"
 
 / {
@@ -14,10 +15,6 @@
 
 	aliases {
 		serial0 = &UART0;
-		led-boot = &status;
-		led-failsafe = &status;
-		led-running = &status;
-		led-upgrade = &status;
 	};
 };
 
@@ -86,19 +83,26 @@
 	leds {
 		compatible = "gpio-leds";
 
-		failsafe: power-red {
-			label = "mbl:red:power";
+		/* There's just one tri-color LED with three separate pins.
+		 * One pin for each color (red, green and blue). Each has
+		 * a different meaning.
+		 */
+		led-0 {
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_FAULT;
 			gpios = <&GPIO1 4 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "panic";
+			panic-indicator;
 		};
 
-		status: power-green {
-			label = "mbl:green:power";
+		led-1 {
+			color = <LED_COLOR_ID_GREEN>;
+			function = LED_FUNCTION_POWER;
 			gpios = <&GPIO1 5 GPIO_ACTIVE_HIGH>;
 		};
 
-		power-blue {
-			label = "mbl:blue:power";
+		led-2 {
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_DISK;
 			gpios = <&GPIO1 6 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "disk-activity";
 		};