kirkwood: copy files and config from 4.19 to 5.4

This commit is simple copy config, files and patches from 4.19 to 5.4
kernel. No changes was done.

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>

12 files changed, 729 insertions, 0 deletions

diff --git a/target/linux/kirkwood/patches-5.4/100-ib62x0.patch b/target/linux/kirkwood/patches-5.4/100-ib62x0.patch
new file mode 100644
index 0000000000..0637c24b63
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/100-ib62x0.patch
@@ -0,0 +1,53 @@
+--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
++++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
+@@ -6,7 +6,14 @@
+ 
+ / {
+ 	model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
+-	compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
++	compatible = "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
++
++	aliases {
++		led-boot = &led_green_os;
++		led-failsafe = &led_red_os;
++		led-running = &led_green_os;
++		led-upgrade = &led_red_os;
++	};
+ 
+ 	memory {
+ 		device_type = "memory";
+@@ -81,12 +88,12 @@
+ 			     &pmx_led_usb_transfer>;
+ 		pinctrl-names = "default";
+ 
+-		green-os {
++		led_green_os: green-os {
+ 			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 +125,13 @@
+ 	};
+ 
+ 	partition@100000 {
+-		label = "uImage";
+-		reg = <0x0100000 0x600000>;
++		label = "second stage u-boot";
++		reg = <0x100000 0x200000>;
+ 	};
+ 
+-	partition@700000 {
+-		label = "root";
+-		reg = <0x0700000 0xf900000>;
++	partition@200000 {
++		label = "ubi";
++		reg = <0x200000 0xfe00000>;
+ 	};
+ 
+ };
diff --git a/target/linux/kirkwood/patches-5.4/101-iconnect.patch b/target/linux/kirkwood/patches-5.4/101-iconnect.patch
new file mode 100644
index 0000000000..935e2dfcf5
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/101-iconnect.patch
@@ -0,0 +1,80 @@
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
++++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
+@@ -8,6 +8,13 @@
+ 	model = "Iomega Iconnect";
+ 	compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ 
++	aliases {
++		led-boot = &led_power_blue;
++		led-failsafe = &led_power_red;
++		led-running = &led_power_blue;
++		led-upgrade = &led_power_red;
++	};
++
+ 	memory {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x10000000>;
+@@ -16,8 +23,6 @@
+ 	chosen {
+ 		bootargs = "console=ttyS0,115200n8 earlyprintk";
+ 		stdout-path = &uart0;
+-		linux,initrd-start = <0x4500040>;
+-		linux,initrd-end   = <0x4800000>;
+ 	};
+ 
+ 	ocp@f1000000 {
+@@ -89,12 +94,12 @@
+ 			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+ 			default-state = "on";
+ 		};
+-		power-blue {
++		led_power_blue: power-blue {
+ 			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 +151,23 @@
+ 	status = "okay";
+ 
+ 	partition@0 {
+-		label = "uboot";
+-		reg = <0x0000000 0xc0000>;
++		label = "u-boot";
++		reg = <0x0000000 0xe0000>;
+ 	};
+ 
+-	partition@a0000 {
+-		label = "env";
+-		reg = <0xa0000 0x20000>;
++	partition@e0000 {
++		label = "u-boot environment";
++		reg = <0xe0000 0x100000>;
+ 	};
+ 
+ 	partition@100000 {
+-		label = "zImage";
+-		reg = <0x100000 0x300000>;
+-	};
+-
+-	partition@540000 {
+-		label = "initrd";
+-		reg = <0x540000 0x300000>;
++		label = "second stage u-boot";
++		reg = <0x100000 0x200000>;
+ 	};
+ 
+-	partition@980000 {
+-		label = "boot";
+-		reg = <0x980000 0x1f400000>;
++	partition@200000 {
++		label = "ubi";
++		reg = <0x200000 0x1fe00000>;
+ 	};
+ };
+ 
diff --git a/target/linux/kirkwood/patches-5.4/102-dockstar.patch b/target/linux/kirkwood/patches-5.4/102-dockstar.patch
new file mode 100644
index 0000000000..127f84962c
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/102-dockstar.patch
@@ -0,0 +1,62 @@
+--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
++++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
+@@ -8,6 +8,13 @@
+ 	model = "Seagate FreeAgent Dockstar";
+ 	compatible = "seagate,dockstar", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ 
++	aliases {
++		led-boot = &led_health;
++		led-failsafe = &led_fault;
++		led-running = &led_health;
++		led-upgrade = &led_fault;
++	};
++
+ 	memory {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x8000000>;
+@@ -42,12 +49,12 @@
+ 		pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
+ 		pinctrl-names = "default";
+ 
+-		health {
++		led_health: health {
+ 			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 +85,22 @@
+ 
+ 	partition@0 {
+ 		label = "u-boot";
+-		reg = <0x0000000 0x100000>;
+-		read-only;
++		reg = <0x0000000 0xe0000>;
++	};
++
++	partition@e0000 {
++		label = "u-boot environment";
++		reg = <0xe0000 0x100000>;
+ 	};
+ 
+ 	partition@100000 {
+-		label = "uImage";
+-		reg = <0x0100000 0x400000>;
++		label = "second stage u-boot";
++		reg = <0x100000 0x200000>;
+ 	};
+ 
+-	partition@500000 {
+-		label = "data";
+-		reg = <0x0500000 0xfb00000>;
++	partition@200000 {
++		label = "ubi";
++		reg = <0x200000 0xfe00000>;
+ 	};
+ };
+ 
diff --git a/target/linux/kirkwood/patches-5.4/103-iomega-ix2-200.patch b/target/linux/kirkwood/patches-5.4/103-iomega-ix2-200.patch
new file mode 100644
index 0000000000..9313b4bc3e
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/103-iomega-ix2-200.patch
@@ -0,0 +1,67 @@
+--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
++++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+@@ -8,6 +8,13 @@
+ 	model = "Iomega StorCenter ix2-200";
+ 	compatible = "iom,ix2-200", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ 
++	aliases {
++		led-boot = &led_power;
++		led-failsafe = &led_health;
++		led-running = &led_power;
++		led-upgrade = &led_health;
++	};
++
+ 	memory {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x10000000>;
+@@ -127,16 +134,16 @@
+ 			      &pmx_led_rebuild &pmx_led_health >;
+ 		pinctrl-names = "default";
+ 
+-		power_led {
++		led_power: power_led {
+ 			label = "status:white:power_led";
+ 			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+-			default-state = "keep";
++			default-state = "on";
+ 		};
+ 		rebuild_led {
+ 			label = "status:white:rebuild_led";
+ 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+ 		};
+-		health_led {
++		led_health: health_led {
+ 			label = "status:red:health_led";
+ 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+ 		};
+@@ -186,18 +193,18 @@
+ 	};
+ 
+ 	partition@a0000 {
+-		label = "env";
++		label = "u-boot environment";
+ 		reg = <0xa0000 0x20000>;
+ 		read-only;
+ 	};
+ 
+ 	partition@100000 {
+-		label = "uImage";
++		label = "kernel";
+ 		reg = <0x100000 0x300000>;
+ 	};
+ 
+ 	partition@400000 {
+-		label = "rootfs";
++		label = "ubi";
+ 		reg = <0x400000 0x1C00000>;
+ 	};
+ };
+@@ -211,7 +218,7 @@
+ };
+ 
+ &eth0 {
+-	status = "okay";
++	status = "disabled";
+ 	ethernet0-port@0 {
+ 		speed = <1000>;
+ 		duplex = <1>;
diff --git a/target/linux/kirkwood/patches-5.4/105-ea4500.patch b/target/linux/kirkwood/patches-5.4/105-ea4500.patch
new file mode 100644
index 0000000000..4c3c82bdfd
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/105-ea4500.patch
@@ -0,0 +1,144 @@
+--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
++++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+@@ -24,6 +24,10 @@
+ 	};
+ 
+ 	aliases {
++		led-boot = &led_white_health;
++		led-failsafe = &led_white_health;
++		led-running = &led_white_health;
++		led-upgrade = &led_white_health;
+ 		serial0 = &uart0;
+ 	};
+ 
+@@ -56,9 +60,10 @@
+ 		pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
+ 		pinctrl-names = "default";
+ 
+-		white-health {
++		led_white_health: white-health {
+ 			label = "viper:white:health";
+ 			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
+ 		};
+ 
+ 		white-pulse {
+@@ -67,9 +72,18 @@
+ 		};
+ 	};
+ 
+-	dsa {
+-		status = "disabled";
++	mvsw61xx {
++		compatible = "marvell,88e6171";
++		status = "okay";
++		reg = <0x10>;
++
++		mii-bus = <&mdio>;
++		cpu-port-0 = <5>;
++		cpu-port-1 = <6>;
++		is-indirect;
++	};
+ 
++	dsa {
+ 		compatible = "marvell,dsa";
+ 		#address-cells = <2>;
+ 		#size-cells = <0>;
+@@ -161,22 +175,22 @@
+ 		};
+ 
+ 		partition@200000 {
+-			label = "kernel";
++			label = "kernel1";
+ 			reg = <0x200000 0x2A0000>;
+ 		};
+ 
+ 		partition@4a0000 {
+-			label = "rootfs";
++			label = "rootfs1";
+ 			reg = <0x4A0000 0x1760000>;
+ 		};
+ 
+ 		partition@1c00000 {
+-			label = "alt_kernel";
++			label = "kernel2";
+ 			reg = <0x1C00000 0x2A0000>;
+ 		};
+ 
+ 		partition@1ea0000 {
+-			label = "alt_rootfs";
++			label = "rootfs2";
+ 			reg = <0x1EA0000 0x1760000>;
+ 		};
+ 
+@@ -207,53 +221,6 @@
+ 
+ &mdio {
+ 	status = "okay";
+-
+-	switch@10 {
+-		compatible = "marvell,mv88e6085";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		reg = <16>;
+-
+-		ports {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-
+-			port@0 {
+-				reg = <0>;
+-				label = "ethernet1";
+-			};
+-
+-			port@1 {
+-				reg = <1>;
+-				label = "ethernet2";
+-			};
+-
+-			port@2 {
+-				reg = <2>;
+-				label = "ethernet3";
+-			};
+-
+-			port@3 {
+-				reg = <3>;
+-				label = "ethernet4";
+-			};
+-
+-			port@4 {
+-				reg = <4>;
+-				label = "internet";
+-			};
+-
+-			port@5 {
+-				reg = <5>;
+-				label = "cpu";
+-				ethernet = <&eth0port>;
+-				fixed-link {
+-					speed = <1000>;
+-					full-duplex;
+-				};
+-			};
+-		};
+-	};
+ };
+ 
+ &uart0 {
+@@ -272,10 +239,14 @@
+ };
+ 
+ /* eth1 is connected to the switch at port 6. However DSA only supports a
+- * single CPU port. So leave this port disabled to avoid confusion.
++ * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
+  */
+ &eth1 {
+-	status = "disabled";
++	status = "okay";
++	ethernet1-port@0 {
++		speed = <1000>;
++		duplex = <1>;
++	};
+ };
+ 
+ /* There is no battery on the board, so the RTC does not keep
diff --git a/target/linux/kirkwood/patches-5.4/106-goflexnet.patch b/target/linux/kirkwood/patches-5.4/106-goflexnet.patch
new file mode 100644
index 0000000000..82cf90841e
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/106-goflexnet.patch
@@ -0,0 +1,53 @@
+--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
++++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
+@@ -8,6 +8,13 @@
+ 	model = "Seagate GoFlex Net";
+ 	compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ 
++	aliases {
++		led-boot = &led_health;
++		led-failsafe = &led_fault;
++		led-running = &led_health;
++		led-upgrade = &led_fault;
++	};
++
+ 	memory {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x8000000>;
+@@ -85,12 +92,12 @@
+ 			    >;
+ 		pinctrl-names = "default";
+ 
+-		health {
++		led_health: health {
+ 			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 +166,8 @@
+ 	};
+ 
+ 	partition@100000 {
+-		label = "uImage";
+-		reg = <0x0100000 0x400000>;
+-	};
+-
+-	partition@500000 {
+-		label = "pogoplug";
+-		reg = <0x0500000 0x2000000>;
+-	};
+-
+-	partition@2500000 {
+-		label = "root";
+-		reg = <0x02500000 0xd800000>;
++		label = "ubi";
++		reg = <0x0100000 0x0ff00000>;
+ 	};
+ };
+ 
diff --git a/target/linux/kirkwood/patches-5.4/107-01-zyxel-nsa3x0-common-nand-partitions.patch b/target/linux/kirkwood/patches-5.4/107-01-zyxel-nsa3x0-common-nand-partitions.patch
new file mode 100644
index 0000000000..df654033fd
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/107-01-zyxel-nsa3x0-common-nand-partitions.patch
@@ -0,0 +1,48 @@
+--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
++++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+@@ -112,40 +112,16 @@
+ 
+ 	partition@0 {
+ 		label = "uboot";
+-		reg = <0x0000000 0x0100000>;
++		reg = <0x0000000 0x00c0000>;
+ 		read-only;
+ 	};
+ 	partition@100000 {
+ 		label = "uboot_env";
+-		reg = <0x0100000 0x0080000>;
++		reg = <0x00c0000 0x0080000>;
+ 	};
+-	partition@180000 {
+-		label = "key_store";
+-		reg = <0x0180000 0x0080000>;
+-	};
+-	partition@200000 {
+-		label = "info";
+-		reg = <0x0200000 0x0080000>;
+-	};
+-	partition@280000 {
+-		label = "etc";
+-		reg = <0x0280000 0x0a00000>;
+-	};
+-	partition@c80000 {
+-		label = "kernel_1";
+-		reg = <0x0c80000 0x0a00000>;
+-	};
+-	partition@1680000 {
+-		label = "rootfs1";
+-		reg = <0x1680000 0x2fc0000>;
+-	};
+-	partition@4640000 {
+-		label = "kernel_2";
+-		reg = <0x4640000 0x0a00000>;
+-	};
+-	partition@5040000 {
+-		label = "rootfs2";
+-		reg = <0x5040000 0x2fc0000>;
++	partition@140000 {
++		label = "ubi";
++		reg = <0x0140000 0x7ec0000>;
+ 	};
+ };
+ 
diff --git a/target/linux/kirkwood/patches-5.4/107-03-nsa325.patch b/target/linux/kirkwood/patches-5.4/107-03-nsa325.patch
new file mode 100644
index 0000000000..36c77cd44a
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/107-03-nsa325.patch
@@ -0,0 +1,31 @@
+--- a/arch/arm/boot/dts/kirkwood-nsa325.dts
++++ b/arch/arm/boot/dts/kirkwood-nsa325.dts
+@@ -15,6 +15,13 @@
+ 	model = "ZyXEL NSA325";
+ 	compatible = "zyxel,nsa325", "marvell,kirkwood-88f6282", "marvell,kirkwood";
+ 
++	aliases {
++		led-boot = &led_green_sys;
++		led-failsafe = &led_orange_sys;
++		led-running = &led_green_sys;
++		led-upgrade = &led_orange_sys;
++	};
++
+ 	memory {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x20000000>;
+@@ -162,11 +169,12 @@
+ 			     &pmx_led_hdd1_green &pmx_led_hdd1_red>;
+ 		pinctrl-names = "default";
+ 
+-		green-sys {
++		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 {
+ 			label = "nsa325:orange:sys";
+ 			gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ 		};
diff --git a/target/linux/kirkwood/patches-5.4/109-pogoplug_v4.patch b/target/linux/kirkwood/patches-5.4/109-pogoplug_v4.patch
new file mode 100644
index 0000000000..4273eb9af1
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/109-pogoplug_v4.patch
@@ -0,0 +1,87 @@
+--- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
++++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
+@@ -18,12 +18,20 @@
+ 	compatible = "cloudengines,pogoplugv4", "marvell,kirkwood-88f6192",
+ 		     "marvell,kirkwood";
+ 
++	aliases {
++		led-boot = &led_health;
++		led-failsafe = &led_fault;
++		led-running = &led_health;
++		led-upgrade = &led_fault;
++	};
++
+ 	memory {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x08000000>;
+ 	};
+ 
+ 	chosen {
++		bootargs = "console=ttyS0,115200";
+ 		stdout-path = "uart0:115200n8";
+ 	};
+ 
+@@ -37,8 +45,8 @@
+ 		eject {
+ 			debounce-interval = <50>;
+ 			wakeup-source;
+-			linux,code = <KEY_EJECTCD>;
+-			label = "Eject Button";
++			linux,code = <KEY_RESTART>;
++			label = "Reset";
+ 			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+ 		};
+ 	};
+@@ -48,12 +56,12 @@
+ 		pinctrl-0 = <&pmx_led_green &pmx_led_red>;
+ 		pinctrl-names = "default";
+ 
+-		health {
++		led_health: health {
+ 			label = "pogoplugv4:green:health";
+ 			gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
+ 			default-state = "on";
+ 		};
+-		fault {
++		led_fault: fault {
+ 			label = "pogoplugv4:red:fault";
+ 			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+ 		};
+@@ -137,29 +145,19 @@
+ 		#size-cells = <1>;
+ 
+ 		partition@0 {
+-			label = "u-boot";
+-			reg = <0x00000000 0x200000>;
++			label = "uboot";
++			reg = <0x00000000 0x1c0000>;
+ 			read-only;
+ 		};
+ 
+-		partition@200000 {
+-			label = "uImage";
+-			reg = <0x00200000 0x300000>;
+-		};
+-
+-		partition@500000 {
+-			label = "uImage2";
+-			reg = <0x00500000 0x300000>;
+-		};
+-
+-		partition@800000 {
+-			label = "failsafe";
+-			reg = <0x00800000 0x800000>;
++		partition@1c0000 {
++			label = "uboot_env";
++			reg = <0x001c0000 0x40000>;
+ 		};
+ 
+-		partition@1000000 {
+-			label = "root";
+-			reg = <0x01000000 0x7000000>;
++		partition@200000 {
++			label = "ubi";
++			reg = <0x00200000 0x7e00000>;
+ 		};
+ 	};
+ };
diff --git a/target/linux/kirkwood/patches-5.4/110-pogo_e02.patch b/target/linux/kirkwood/patches-5.4/110-pogo_e02.patch
new file mode 100644
index 0000000000..59d2893466
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/110-pogo_e02.patch
@@ -0,0 +1,32 @@
+--- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts
++++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
+@@ -20,6 +20,13 @@
+ 	compatible = "cloudengines,pogoe02", "marvell,kirkwood-88f6281",
+ 		     "marvell,kirkwood";
+ 
++	aliases {
++		led-boot = &led_health;
++		led-failsafe = &led_fault;
++		led-running = &led_health;
++		led-upgrade = &led_fault;
++	};
++
+ 	memory {
+ 		device_type = "memory";
+ 		reg = <0x00000000 0x10000000>;
+@@ -33,12 +40,12 @@
+ 	gpio-leds {
+ 		compatible = "gpio-leds";
+ 
+-		health {
++		led_health: health {
+ 			label = "pogo_e02:green:health";
+ 			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+-			default-state = "keep";
++			default-state = "on";
+ 		};
+-		fault {
++		led_fault: fault {
+ 			label = "pogo_e02:orange:fault";
+ 			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+ 		};
diff --git a/target/linux/kirkwood/patches-5.4/201-enable-sata-port-specific-led-triggers.patch b/target/linux/kirkwood/patches-5.4/201-enable-sata-port-specific-led-triggers.patch
new file mode 100644
index 0000000000..71d9bba3f1
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/201-enable-sata-port-specific-led-triggers.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-mvebu/Kconfig
++++ b/arch/arm/mach-mvebu/Kconfig
+@@ -118,6 +118,7 @@ config MACH_DOVE
+ config MACH_KIRKWOOD
+ 	bool "Marvell Kirkwood boards"
+ 	depends on ARCH_MULTI_V5
++	select ARCH_WANT_LIBATA_LEDS
+ 	select CPU_FEROCEON
+ 	select GPIOLIB
+ 	select KIRKWOOD_CLK
diff --git a/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch
new file mode 100644
index 0000000000..860d7b0728
--- /dev/null
+++ b/target/linux/kirkwood/patches-5.4/202-linksys-find-active-root.patch
@@ -0,0 +1,62 @@
+The WRT1900AC among other Linksys routers uses a dual-firmware layout.
+Dynamically rename the active partition to "ubi".
+
+Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
+---
+--- a/drivers/mtd/ofpart.c
++++ b/drivers/mtd/ofpart.c
+@@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
+ 	return of_get_property(pp, "compatible", NULL);
+ }
+ 
++static int mangled_rootblock;
++
+ static int parse_fixed_partitions(struct mtd_info *master,
+ 				  const struct mtd_partition **pparts,
+ 				  struct mtd_part_parser_data *data)
+@@ -32,6 +34,7 @@ static int parse_fixed_partitions(struct
+ 	struct mtd_partition *parts;
+ 	struct device_node *mtd_node;
+ 	struct device_node *ofpart_node;
++	const char *owrtpart = "ubi";
+ 	const char *partname;
+ 	struct device_node *pp;
+ 	int nr_parts, i, ret = 0;
+@@ -110,9 +113,15 @@ static int parse_fixed_partitions(struct
+ 		parts[i].size = of_read_number(reg + a_cells, s_cells);
+ 		parts[i].of_node = pp;
+ 
+-		partname = of_get_property(pp, "label", &len);
+-		if (!partname)
+-			partname = of_get_property(pp, "name", &len);
++		if (mangled_rootblock && (i == mangled_rootblock)) {
++			partname = owrtpart;
++		} else {
++			partname = of_get_property(pp, "label", &len);
++
++			if (!partname)
++				partname = of_get_property(pp, "name", &len);
++		}
++
+ 		parts[i].name = partname;
+ 
+ 		if (of_get_property(pp, "read-only", &len))
+@@ -219,6 +228,18 @@ static int __init ofpart_parser_init(voi
+ 	return 0;
+ }
+ 
++static int __init active_root(char *str)
++{
++	get_option(&str, &mangled_rootblock);
++
++	if (!mangled_rootblock)
++		return 1;
++
++	return 1;
++}
++
++__setup("mangled_rootblock=", active_root);
++
+ static void __exit ofpart_parser_exit(void)
+ {
+ 	deregister_mtd_parser(&ofpart_parser);