diff --git a/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch b/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch
new file mode 100644
index 000000000..e96625c89
--- /dev/null
+++ b/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch
@@ -0,0 +1,85 @@
+diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
+index 0c9c3be44..a85e80a7e 100644
+--- a/arch/arm/boot/dts/armada-388-helios4.dts
++++ b/arch/arm/boot/dts/armada-388-helios4.dts
+@@ -132,11 +132,15 @@ usb-led {
+ 	fan1: j10-pwm {
+ 		compatible = "pwm-fan";
+ 		pwms = <&gpio1 9 40000>;	/* Target freq:25 kHz */
++		pinctrl-names = "default";
++		pinctrl-0 = <&j10_pins>;
+ 	};
+ 
+ 	fan2: j17-pwm {
+ 		compatible = "pwm-fan";
+ 		pwms = <&gpio1 23 40000>;	/* Target freq:25 kHz */
++		pinctrl-names = "default";
++		pinctrl-0 = <&j17_pins>;
+ 	};
+ 
+ 	usb2_phy: usb2-phy {
+@@ -299,9 +303,12 @@ helios_led_pins: helios-led-pins {
+ 			       "mpp54";
+ 		marvell,function = "gpio";
+ 	};
+-	helios_fan_pins: helios-fan-pins {
+-		marvell,pins = "mpp41", "mpp43",
+-			       "mpp48", "mpp55";
++	j10_pins: fan-j10-pins {
++		marvell,pins = "mpp41", "mpp43";
++		marvell,function = "gpio";
++	};
++	j17_pins: fan-j17-pins {
++		marvell,pins = "mpp48", "mpp55";
+ 		marvell,function = "gpio";
+ 	};
+ };
+diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
+index a85e80a7e..702efe783 100644
+--- a/arch/arm/boot/dts/armada-388-helios4.dts
++++ b/arch/arm/boot/dts/armada-388-helios4.dts
+@@ -69,6 +69,9 @@ reg_5p0v_usb: regulator-5v-usb {
+ 
+ 	system-leds {
+ 		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&helios_system_led_pins>;
++				
+ 		status-led {
+ 			label = "helios4:green:status";
+ 			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+@@ -97,6 +100,9 @@ wol {
+ 
+ 	io-leds {
+ 		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&helios_io_led_pins>;
++		
+ 		sata1-led {
+ 			label = "helios4:green:ata1";
+ 			gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+@@ -296,13 +302,21 @@ helios_sdhci_cd_pins: helios-sdhci-cd-pins {
+ 		marvell,pins = "mpp20";
+ 		marvell,function = "gpio";
+ 	};
+-	helios_led_pins: helios-led-pins {
+-		marvell,pins = "mpp24", "mpp25",
+-			       "mpp49", "mpp50",
++	
++	helios_system_led_pins: helios-system-led-pins {
++		marvell,pins = "mpp24", "mpp25";
++
++		marvell,function = "gpio";
++	};
++	
++	helios_io_led_pins: helios-io-led-pins {
++		marvell,pins = "mpp49", "mpp50",
+ 			       "mpp52", "mpp53",
+ 			       "mpp54";
++
+ 		marvell,function = "gpio";
+ 	};
++	
+ 	j10_pins: fan-j10-pins {
+ 		marvell,pins = "mpp41", "mpp43";
+ 		marvell,function = "gpio";
diff --git a/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan.patch b/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan.patch
deleted file mode 100644
index 378ad888c..000000000
--- a/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
-index 0c9c3be44..a85e80a7e 100644
---- a/arch/arm/boot/dts/armada-388-helios4.dts
-+++ b/arch/arm/boot/dts/armada-388-helios4.dts
-@@ -132,11 +132,15 @@ usb-led {
- 	fan1: j10-pwm {
- 		compatible = "pwm-fan";
- 		pwms = <&gpio1 9 40000>;	/* Target freq:25 kHz */
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&j10_pins>;
- 	};
- 
- 	fan2: j17-pwm {
- 		compatible = "pwm-fan";
- 		pwms = <&gpio1 23 40000>;	/* Target freq:25 kHz */
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&j17_pins>;
- 	};
- 
- 	usb2_phy: usb2-phy {
-@@ -299,9 +303,12 @@ helios_led_pins: helios-led-pins {
- 			       "mpp54";
- 		marvell,function = "gpio";
- 	};
--	helios_fan_pins: helios-fan-pins {
--		marvell,pins = "mpp41", "mpp43",
--			       "mpp48", "mpp55";
-+	j10_pins: fan-j10-pins {
-+		marvell,pins = "mpp41", "mpp43";
-+		marvell,function = "gpio";
-+	};
-+	j17_pins: fan-j17-pins {
-+		marvell,pins = "mpp48", "mpp55";
- 		marvell,function = "gpio";
- 	};
- };