kirkwood: set default state for status LEDs in device tree

This adds the default-state = "on"; statement for the power or
primary status LED in DTS on kirkwood. This will ensure that this
LED will be lit up very early in the boot process (i.e. before
diag.sh is executed) and thus will provide an additional hint to the
user when problems arise during early boot process.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

26 files changed, 78 insertions, 50 deletions

diff --git a/target/linux/kirkwood/patches-4.14/100-ib62x0.patch b/target/linux/kirkwood/patches-4.14/100-ib62x0.patch
index 494540d730..0637c24b63 100644
--- a/target/linux/kirkwood/patches-4.14/100-ib62x0.patch
+++ b/target/linux/kirkwood/patches-4.14/100-ib62x0.patch
@@ -16,7 +16,7 @@
  
  	memory {
  		device_type = "memory";
-@@ -81,12 +88,11 @@
+@@ -81,12 +88,12 @@
  			     &pmx_led_usb_transfer>;
  		pinctrl-names = "default";
  
@@ -25,13 +25,14 @@
  			label = "ib62x0:green:os";
  			gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		red-os {
 +		led_red_os: red-os {
  			label = "ib62x0:red:os";
  			gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
  		};
-@@ -118,13 +124,13 @@
+@@ -118,13 +125,13 @@
  	};
  
  	partition@100000 {
diff --git a/target/linux/kirkwood/patches-4.14/101-iconnect.patch b/target/linux/kirkwood/patches-4.14/101-iconnect.patch
index f36f50eae4..9fd14a955b 100644
--- a/target/linux/kirkwood/patches-4.14/101-iconnect.patch
+++ b/target/linux/kirkwood/patches-4.14/101-iconnect.patch
@@ -23,7 +23,7 @@
  	};
  
  	ocp@f1000000 {
-@@ -89,12 +94,11 @@
+@@ -89,12 +94,12 @@
  			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
  			default-state = "on";
  		};
@@ -32,13 +32,14 @@
  			label = "power:blue";
  			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		power-red {
 +		led_power_red: power-red {
  			label = "power:red";
  			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
  		};
-@@ -146,28 +150,23 @@
+@@ -146,28 +151,23 @@
  	status = "okay";
  
  	partition@0 {
diff --git a/target/linux/kirkwood/patches-4.14/102-dockstar.patch b/target/linux/kirkwood/patches-4.14/102-dockstar.patch
index fb05e469bc..127f84962c 100644
--- a/target/linux/kirkwood/patches-4.14/102-dockstar.patch
+++ b/target/linux/kirkwood/patches-4.14/102-dockstar.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x8000000>;
-@@ -42,12 +49,11 @@
+@@ -42,12 +49,12 @@
  		pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
  		pinctrl-names = "default";
  
@@ -23,13 +23,14 @@
  			label = "status:green:health";
  			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {
  			label = "status:orange:fault";
  			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
  		};
-@@ -78,18 +84,22 @@
+@@ -78,18 +85,22 @@
  
  	partition@0 {
  		label = "u-boot";
diff --git a/target/linux/kirkwood/patches-4.14/103-iomega-ix2-200.patch b/target/linux/kirkwood/patches-4.14/103-iomega-ix2-200.patch
index 73655e1293..9313b4bc3e 100644
--- a/target/linux/kirkwood/patches-4.14/103-iomega-ix2-200.patch
+++ b/target/linux/kirkwood/patches-4.14/103-iomega-ix2-200.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x10000000>;
-@@ -127,16 +134,15 @@
+@@ -127,16 +134,16 @@
  			      &pmx_led_rebuild &pmx_led_health >;
  		pinctrl-names = "default";
  
@@ -23,6 +23,7 @@
  			label = "status:white:power_led";
  			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
 -			default-state = "keep";
++			default-state = "on";
  		};
  		rebuild_led {
  			label = "status:white:rebuild_led";
@@ -33,7 +34,7 @@
  			label = "status:red:health_led";
  			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
  		};
-@@ -186,18 +192,18 @@
+@@ -186,18 +193,18 @@
  	};
  
  	partition@a0000 {
@@ -55,7 +56,7 @@
  		reg = <0x400000 0x1C00000>;
  	};
  };
-@@ -211,7 +217,7 @@
+@@ -211,7 +218,7 @@
  };
  
  &eth0 {
diff --git a/target/linux/kirkwood/patches-4.14/104-ea3500.patch b/target/linux/kirkwood/patches-4.14/104-ea3500.patch
index 2aef79035e..851875c645 100644
--- a/target/linux/kirkwood/patches-4.14/104-ea3500.patch
+++ b/target/linux/kirkwood/patches-4.14/104-ea3500.patch
@@ -10,7 +10,7 @@
  	kirkwood-lsxhl.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
-@@ -0,0 +1,249 @@
+@@ -0,0 +1,250 @@
 +/*
 + * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
 + *
@@ -78,6 +78,7 @@
 +		led_power: power {
 +			label = "audi:green:power";
 +			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
 +		};
 +	};
 +
diff --git a/target/linux/kirkwood/patches-4.14/105-ea4500.patch b/target/linux/kirkwood/patches-4.14/105-ea4500.patch
index 0c2b30df0d..cfa499c911 100644
--- a/target/linux/kirkwood/patches-4.14/105-ea4500.patch
+++ b/target/linux/kirkwood/patches-4.14/105-ea4500.patch
@@ -11,7 +11,7 @@
  		serial0 = &uart0;
  	};
  
-@@ -58,7 +62,7 @@
+@@ -58,9 +62,10 @@
  		pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
  		pinctrl-names = "default";
  
@@ -19,8 +19,11 @@
 +		led_white_health: white-health {
  			label = "viper:white:health";
  			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
  		};
-@@ -69,9 +73,18 @@
+ 
+ 		white-pulse {
+@@ -69,9 +74,18 @@
  		};
  	};
  
@@ -41,7 +44,7 @@
  		compatible = "marvell,dsa";
  		#address-cells = <2>;
  		#size-cells = <0>;
-@@ -163,22 +176,22 @@
+@@ -163,22 +177,22 @@
  		};
  
  		partition@200000 {
@@ -68,7 +71,7 @@
  			reg = <0x1EA0000 0x1760000>;
  		};
  
-@@ -209,53 +222,6 @@
+@@ -209,53 +223,6 @@
  
  &mdio {
  	status = "okay";
@@ -122,7 +125,7 @@
  };
  
  &uart0 {
-@@ -274,10 +240,14 @@
+@@ -274,10 +241,14 @@
  };
  
  /* eth1 is connected to the switch at port 6. However DSA only supports a
diff --git a/target/linux/kirkwood/patches-4.14/105-goflexhome.patch b/target/linux/kirkwood/patches-4.14/105-goflexhome.patch
index 8f181ac472..fcccbf7f39 100644
--- a/target/linux/kirkwood/patches-4.14/105-goflexhome.patch
+++ b/target/linux/kirkwood/patches-4.14/105-goflexhome.patch
@@ -10,7 +10,7 @@
  	kirkwood-ib62x0.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
-@@ -0,0 +1,123 @@
+@@ -0,0 +1,124 @@
 +/dts-v1/;
 +
 +#include "kirkwood.dtsi"
@@ -72,6 +72,7 @@
 +		led_health: health {
 +			label = "status:green:health";
 +			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
++			default-state = "on";
 +		};
 +		led_fault: fault {
 +			label = "status:orange:fault";
diff --git a/target/linux/kirkwood/patches-4.14/106-goflexnet.patch b/target/linux/kirkwood/patches-4.14/106-goflexnet.patch
index 340a4809de..82cf90841e 100644
--- a/target/linux/kirkwood/patches-4.14/106-goflexnet.patch
+++ b/target/linux/kirkwood/patches-4.14/106-goflexnet.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x8000000>;
-@@ -85,12 +92,11 @@
+@@ -85,12 +92,12 @@
  			    >;
  		pinctrl-names = "default";
  
@@ -23,13 +23,14 @@
  			label = "status:green:health";
  			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {
  			label = "status:orange:fault";
  			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
  		};
-@@ -159,18 +165,8 @@
+@@ -159,18 +166,8 @@
  	};
  
  	partition@100000 {
diff --git a/target/linux/kirkwood/patches-4.14/107-02-nsa310b.patch b/target/linux/kirkwood/patches-4.14/107-02-nsa310b.patch
index 2da8f4f0d1..1f2718fb80 100644
--- a/target/linux/kirkwood/patches-4.14/107-02-nsa310b.patch
+++ b/target/linux/kirkwood/patches-4.14/107-02-nsa310b.patch
@@ -20,7 +20,7 @@ NOTE: this patch can be upstreamed as-is, LEDE-specific
  	kirkwood-openblocks_a6.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,132 @@
 +/dts-v1/;
 +
 +#include "kirkwood-nsa3x0-common.dtsi"
@@ -113,6 +113,7 @@ NOTE: this patch can be upstreamed as-is, LEDE-specific
 +		led_green_sys: green-sys {
 +			label = "nsa310:green:sys";
 +			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
 +		};
 +		led_red_sys: red-sys {
 +			label = "nsa310:red:sys";
diff --git a/target/linux/kirkwood/patches-4.14/107-03-nsa325.patch b/target/linux/kirkwood/patches-4.14/107-03-nsa325.patch
index 5d1963b2b0..e6935613e3 100644
--- a/target/linux/kirkwood/patches-4.14/107-03-nsa325.patch
+++ b/target/linux/kirkwood/patches-4.14/107-03-nsa325.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x20000000>;
-@@ -165,11 +172,11 @@
+@@ -165,11 +172,12 @@
  			     &pmx_led_hdd1_green &pmx_led_hdd1_red>;
  		pinctrl-names = "default";
  
@@ -22,6 +22,7 @@
 +		led_green_sys: green-sys {
  			label = "nsa325:green:sys";
  			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
  		};
 -		orange-sys {
 +		led_orange_sys: orange-sys {
diff --git a/target/linux/kirkwood/patches-4.14/108-on100.patch b/target/linux/kirkwood/patches-4.14/108-on100.patch
index 42da3e7332..78f2f4a3fe 100644
--- a/target/linux/kirkwood/patches-4.14/108-on100.patch
+++ b/target/linux/kirkwood/patches-4.14/108-on100.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-on100.dts
-@@ -0,0 +1,164 @@
+@@ -0,0 +1,165 @@
 +/dts-v1/;
 +
 +#include "kirkwood.dtsi"
@@ -50,6 +50,7 @@
 +		led_health_green: health_green {
 +			label = "on100:green:health";
 +			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
++			default-state = "on";
 +		};
 +
 +		led_health_red: health_red {
diff --git a/target/linux/kirkwood/patches-4.14/109-pogoplug_v4.patch b/target/linux/kirkwood/patches-4.14/109-pogoplug_v4.patch
index f23cd93f33..f13d459223 100644
--- a/target/linux/kirkwood/patches-4.14/109-pogoplug_v4.patch
+++ b/target/linux/kirkwood/patches-4.14/109-pogoplug_v4.patch
@@ -32,7 +32,7 @@
  			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
  		};
  	};
-@@ -48,12 +56,11 @@
+@@ -48,12 +56,12 @@
  		pinctrl-0 = <&pmx_led_green &pmx_led_red>;
  		pinctrl-names = "default";
  
@@ -40,14 +40,14 @@
 +		led_health: health {
  			label = "pogoplugv4:green:health";
  			gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
--			default-state = "on";
+ 			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {
  			label = "pogoplugv4:red:fault";
  			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
  		};
-@@ -137,29 +144,19 @@
+@@ -137,29 +145,19 @@
  		#size-cells = <1>;
  
  		partition@0 {
diff --git a/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch b/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch
index 8bba4b1a3c..b2a9c461d8 100644
--- a/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch
+++ b/target/linux/kirkwood/patches-4.14/110-pogo_e02.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x10000000>;
-@@ -35,12 +42,11 @@
+@@ -35,12 +42,12 @@
  	gpio-leds {
  		compatible = "gpio-leds";
  
@@ -23,6 +23,7 @@
  			label = "pogo_e02:green:health";
  			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {
diff --git a/target/linux/kirkwood/patches-4.19/100-ib62x0.patch b/target/linux/kirkwood/patches-4.19/100-ib62x0.patch
index 494540d730..0637c24b63 100644
--- a/target/linux/kirkwood/patches-4.19/100-ib62x0.patch
+++ b/target/linux/kirkwood/patches-4.19/100-ib62x0.patch
@@ -16,7 +16,7 @@
  
  	memory {
  		device_type = "memory";
-@@ -81,12 +88,11 @@
+@@ -81,12 +88,12 @@
  			     &pmx_led_usb_transfer>;
  		pinctrl-names = "default";
  
@@ -25,13 +25,14 @@
  			label = "ib62x0:green:os";
  			gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		red-os {
 +		led_red_os: red-os {
  			label = "ib62x0:red:os";
  			gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
  		};
-@@ -118,13 +124,13 @@
+@@ -118,13 +125,13 @@
  	};
  
  	partition@100000 {
diff --git a/target/linux/kirkwood/patches-4.19/101-iconnect.patch b/target/linux/kirkwood/patches-4.19/101-iconnect.patch
index f36f50eae4..9fd14a955b 100644
--- a/target/linux/kirkwood/patches-4.19/101-iconnect.patch
+++ b/target/linux/kirkwood/patches-4.19/101-iconnect.patch
@@ -23,7 +23,7 @@
  	};
  
  	ocp@f1000000 {
-@@ -89,12 +94,11 @@
+@@ -89,12 +94,12 @@
  			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
  			default-state = "on";
  		};
@@ -32,13 +32,14 @@
  			label = "power:blue";
  			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		power-red {
 +		led_power_red: power-red {
  			label = "power:red";
  			gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
  		};
-@@ -146,28 +150,23 @@
+@@ -146,28 +151,23 @@
  	status = "okay";
  
  	partition@0 {
diff --git a/target/linux/kirkwood/patches-4.19/102-dockstar.patch b/target/linux/kirkwood/patches-4.19/102-dockstar.patch
index fb05e469bc..127f84962c 100644
--- a/target/linux/kirkwood/patches-4.19/102-dockstar.patch
+++ b/target/linux/kirkwood/patches-4.19/102-dockstar.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x8000000>;
-@@ -42,12 +49,11 @@
+@@ -42,12 +49,12 @@
  		pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
  		pinctrl-names = "default";
  
@@ -23,13 +23,14 @@
  			label = "status:green:health";
  			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {
  			label = "status:orange:fault";
  			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
  		};
-@@ -78,18 +84,22 @@
+@@ -78,18 +85,22 @@
  
  	partition@0 {
  		label = "u-boot";
diff --git a/target/linux/kirkwood/patches-4.19/103-iomega-ix2-200.patch b/target/linux/kirkwood/patches-4.19/103-iomega-ix2-200.patch
index 73655e1293..9313b4bc3e 100644
--- a/target/linux/kirkwood/patches-4.19/103-iomega-ix2-200.patch
+++ b/target/linux/kirkwood/patches-4.19/103-iomega-ix2-200.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x10000000>;
-@@ -127,16 +134,15 @@
+@@ -127,16 +134,16 @@
  			      &pmx_led_rebuild &pmx_led_health >;
  		pinctrl-names = "default";
  
@@ -23,6 +23,7 @@
  			label = "status:white:power_led";
  			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
 -			default-state = "keep";
++			default-state = "on";
  		};
  		rebuild_led {
  			label = "status:white:rebuild_led";
@@ -33,7 +34,7 @@
  			label = "status:red:health_led";
  			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
  		};
-@@ -186,18 +192,18 @@
+@@ -186,18 +193,18 @@
  	};
  
  	partition@a0000 {
@@ -55,7 +56,7 @@
  		reg = <0x400000 0x1C00000>;
  	};
  };
-@@ -211,7 +217,7 @@
+@@ -211,7 +218,7 @@
  };
  
  &eth0 {
diff --git a/target/linux/kirkwood/patches-4.19/104-ea3500.patch b/target/linux/kirkwood/patches-4.19/104-ea3500.patch
index 466bf714c4..04a919e072 100644
--- a/target/linux/kirkwood/patches-4.19/104-ea3500.patch
+++ b/target/linux/kirkwood/patches-4.19/104-ea3500.patch
@@ -10,7 +10,7 @@
  	kirkwood-lsxhl.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
-@@ -0,0 +1,250 @@
+@@ -0,0 +1,251 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
@@ -74,6 +74,7 @@
 +		led_power: power {
 +			label = "audi:green:power";
 +			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
 +		};
 +	};
 +
diff --git a/target/linux/kirkwood/patches-4.19/105-ea4500.patch b/target/linux/kirkwood/patches-4.19/105-ea4500.patch
index 601c1cad6d..5948a1bdf1 100644
--- a/target/linux/kirkwood/patches-4.19/105-ea4500.patch
+++ b/target/linux/kirkwood/patches-4.19/105-ea4500.patch
@@ -11,7 +11,7 @@
  		serial0 = &uart0;
  	};
  
-@@ -56,7 +60,7 @@
+@@ -56,9 +60,10 @@
  		pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
  		pinctrl-names = "default";
  
@@ -19,8 +19,11 @@
 +		led_white_health: white-health {
  			label = "viper:white:health";
  			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
  		};
-@@ -67,9 +71,23 @@
+ 
+ 		white-pulse {
+@@ -67,9 +72,23 @@
  		};
  	};
  
@@ -46,7 +49,7 @@
  		compatible = "marvell,dsa";
  		#address-cells = <2>;
  		#size-cells = <0>;
-@@ -161,22 +179,22 @@
+@@ -161,22 +180,22 @@
  		};
  
  		partition@200000 {
@@ -73,7 +76,7 @@
  			reg = <0x1EA0000 0x1760000>;
  		};
  
-@@ -207,53 +225,6 @@
+@@ -207,53 +226,6 @@
  
  &mdio {
  	status = "okay";
@@ -127,7 +130,7 @@
  };
  
  &uart0 {
-@@ -272,10 +243,14 @@
+@@ -272,10 +244,14 @@
  };
  
  /* eth1 is connected to the switch at port 6. However DSA only supports a
diff --git a/target/linux/kirkwood/patches-4.19/105-goflexhome.patch b/target/linux/kirkwood/patches-4.19/105-goflexhome.patch
index db43a27219..cca65f2141 100644
--- a/target/linux/kirkwood/patches-4.19/105-goflexhome.patch
+++ b/target/linux/kirkwood/patches-4.19/105-goflexhome.patch
@@ -10,7 +10,7 @@
  	kirkwood-ib62x0.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
-@@ -0,0 +1,123 @@
+@@ -0,0 +1,124 @@
 +/dts-v1/;
 +
 +#include "kirkwood.dtsi"
@@ -72,6 +72,7 @@
 +		led_health: health {
 +			label = "status:green:health";
 +			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
++			default-state = "on";
 +		};
 +		led_fault: fault {
 +			label = "status:orange:fault";
diff --git a/target/linux/kirkwood/patches-4.19/106-goflexnet.patch b/target/linux/kirkwood/patches-4.19/106-goflexnet.patch
index 340a4809de..82cf90841e 100644
--- a/target/linux/kirkwood/patches-4.19/106-goflexnet.patch
+++ b/target/linux/kirkwood/patches-4.19/106-goflexnet.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x8000000>;
-@@ -85,12 +92,11 @@
+@@ -85,12 +92,12 @@
  			    >;
  		pinctrl-names = "default";
  
@@ -23,13 +23,14 @@
  			label = "status:green:health";
  			gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {
  			label = "status:orange:fault";
  			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
  		};
-@@ -159,18 +165,8 @@
+@@ -159,18 +166,8 @@
  	};
  
  	partition@100000 {
diff --git a/target/linux/kirkwood/patches-4.19/107-02-nsa310b.patch b/target/linux/kirkwood/patches-4.19/107-02-nsa310b.patch
index 5e2b1d8d9c..ba2ae7d2de 100644
--- a/target/linux/kirkwood/patches-4.19/107-02-nsa310b.patch
+++ b/target/linux/kirkwood/patches-4.19/107-02-nsa310b.patch
@@ -20,7 +20,7 @@ NOTE: this patch can be upstreamed as-is, LEDE-specific
  	kirkwood-openblocks_a6.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,132 @@
 +/dts-v1/;
 +
 +#include "kirkwood-nsa3x0-common.dtsi"
@@ -113,6 +113,7 @@ NOTE: this patch can be upstreamed as-is, LEDE-specific
 +		led_green_sys: green-sys {
 +			label = "nsa310:green:sys";
 +			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
 +		};
 +		led_red_sys: red-sys {
 +			label = "nsa310:red:sys";
diff --git a/target/linux/kirkwood/patches-4.19/107-03-nsa325.patch b/target/linux/kirkwood/patches-4.19/107-03-nsa325.patch
index aefb5c34dc..36c77cd44a 100644
--- a/target/linux/kirkwood/patches-4.19/107-03-nsa325.patch
+++ b/target/linux/kirkwood/patches-4.19/107-03-nsa325.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x20000000>;
-@@ -162,11 +169,11 @@
+@@ -162,11 +169,12 @@
  			     &pmx_led_hdd1_green &pmx_led_hdd1_red>;
  		pinctrl-names = "default";
  
@@ -22,6 +22,7 @@
 +		led_green_sys: green-sys {
  			label = "nsa325:green:sys";
  			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
  		};
 -		orange-sys {
 +		led_orange_sys: orange-sys {
diff --git a/target/linux/kirkwood/patches-4.19/108-on100.patch b/target/linux/kirkwood/patches-4.19/108-on100.patch
index fa92509e2e..bc0916f161 100644
--- a/target/linux/kirkwood/patches-4.19/108-on100.patch
+++ b/target/linux/kirkwood/patches-4.19/108-on100.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-on100.dts
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,163 @@
 +/dts-v1/;
 +
 +#include "kirkwood.dtsi"
@@ -48,6 +48,7 @@
 +		led_health_green: health_green {
 +			label = "on100:green:health";
 +			gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
++			default-state = "on";
 +		};
 +
 +		led_health_red: health_red {
diff --git a/target/linux/kirkwood/patches-4.19/109-pogoplug_v4.patch b/target/linux/kirkwood/patches-4.19/109-pogoplug_v4.patch
index 6967a0c815..813650124c 100644
--- a/target/linux/kirkwood/patches-4.19/109-pogoplug_v4.patch
+++ b/target/linux/kirkwood/patches-4.19/109-pogoplug_v4.patch
@@ -32,7 +32,7 @@
  			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
  		};
  	};
-@@ -48,12 +56,11 @@
+@@ -48,12 +56,12 @@
  		pinctrl-0 = <&pmx_led_green &pmx_led_red>;
  		pinctrl-names = "default";
  
@@ -40,14 +40,14 @@
 +		led_health: health {
  			label = "pogoplugv4:green:health";
  			gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
--			default-state = "on";
+ 			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {
  			label = "pogoplugv4:red:fault";
  			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
  		};
-@@ -137,29 +144,19 @@
+@@ -137,29 +145,19 @@
  		#size-cells = <1>;
  
  		partition@0 {
diff --git a/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch b/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch
index 82a13cca47..59d2893466 100644
--- a/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch
+++ b/target/linux/kirkwood/patches-4.19/110-pogo_e02.patch
@@ -14,7 +14,7 @@
  	memory {
  		device_type = "memory";
  		reg = <0x00000000 0x10000000>;
-@@ -33,12 +40,11 @@
+@@ -33,12 +40,12 @@
  	gpio-leds {
  		compatible = "gpio-leds";
  
@@ -23,6 +23,7 @@
  			label = "pogo_e02:green:health";
  			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
 -			default-state = "keep";
++			default-state = "on";
  		};
 -		fault {
 +		led_fault: fault {