diff --git a/target/linux/kirkwood/patches-4.14/100-ib62x0.patch b/target/linux/kirkwood/patches-4.14/100-ib62x0.patch
index 494540d730fe8b200c6bea2494c4f5cd57d92565..0637c24b631867111ead70b8f21d0b98576b5cea 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 f36f50eae408057a365d2017dbd9a90f2060476b..9fd14a955b50f0290e7038cb976695c5f6f63dc2 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 fb05e469bcfd10756a196ccb7c88824d01a8e10c..127f84962c195ee63e69db988dfc72c993c428c5 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 73655e129307d32362f4e3b1a82cff520c594497..9313b4bc3e30b993a6403e773660f3d7d0e8c013 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 2aef79035e5e81260cd62d2d670a3c0289f2966c..851875c64575dc213d0015db9407bf41180b9fe6 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 0c2b30df0dc22219fd3a849b7e55c906656675ea..cfa499c91130cabf337a7de395f28634e4f55729 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 8f181ac4722d0874426d14e64ba4ee9dfeab1d54..fcccbf7f39363aaa094a186d8221ae9304e0addb 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 340a4809de595fe78006fbaa933d1b8c12883b6a..82cf90841e30b7f05ce9ae9dbe290bd7883222bc 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 2da8f4f0d1b1eabc2c56f925fe4dc35918afff1f..1f2718fb80cc5bec6c0bfca79c0481f913218fa0 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 5d1963b2b0327b1fdab7b60bd501b28b6e48f9a5..e6935613e33a169c7aad5078b74b74a62fa95026 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 42da3e733225c472bd969e8de9bd8f3084c02c58..78f2f4a3fef61e76473bde5c7fa1a306575a2366 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 f23cd93f3366503f797e2c4667c0c8372338ceed..f13d459223c0e60314464eebd7ec951fd324954c 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 8bba4b1a3c42993daf8fc9962c5e99db3ebc6d30..b2a9c461d8c7d99dfe7d762575d6642efe73b21d 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 494540d730fe8b200c6bea2494c4f5cd57d92565..0637c24b631867111ead70b8f21d0b98576b5cea 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 f36f50eae408057a365d2017dbd9a90f2060476b..9fd14a955b50f0290e7038cb976695c5f6f63dc2 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 fb05e469bcfd10756a196ccb7c88824d01a8e10c..127f84962c195ee63e69db988dfc72c993c428c5 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 73655e129307d32362f4e3b1a82cff520c594497..9313b4bc3e30b993a6403e773660f3d7d0e8c013 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 466bf714c42d2d9261e83fe1a7ea41f892602b93..04a919e07267d8fd365a3b7ff23f9b00432c2ffd 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 601c1cad6d8e3344c19baa6ada44074ff595c761..5948a1bdf1e857748dc5e904341b532f5d578bcd 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 db43a2721981dfe5965c4d8cd691cbe41ba3873f..cca65f2141be025b8eab4dcc346f3a9705f679e0 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 340a4809de595fe78006fbaa933d1b8c12883b6a..82cf90841e30b7f05ce9ae9dbe290bd7883222bc 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 5e2b1d8d9c3bc238a361c1caeac13e00d4b817ba..ba2ae7d2de8a204b399586b8d1f66d2f7285ede0 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 aefb5c34dcc6ddfe469056e230a5b01829712bcf..36c77cd44a298f27236d6f8247907aac0b891736 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 fa92509e2e055f22a679afb6ca42084287b32411..bc0916f1617ac71d34bd564672aa9aa49131b7a7 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 6967a0c815ec145f43359ec65446da0642755636..813650124cc52c1eab91944aabdc71bc690a26d6 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 82a13cca47ff79978f84ece2a40ff7d2b308b64d..59d2893466e16d1dd5f627d6170c1377a757b6d7 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 {