diff --git a/arm64-96boards-RK3399-Ficus-board.patch b/arm64-96boards-RK3399-Ficus-board.patch
index 5311050..83359b5 100644
--- a/arm64-96boards-RK3399-Ficus-board.patch
+++ b/arm64-96boards-RK3399-Ficus-board.patch
@@ -1,3 +1,170 @@
+From b41023282d07b61a53e2c9b9508912b1e7ce7b4f Mon Sep 17 00:00:00 2001
+From: Randy Li <ayaka@soulik.info>
+Date: Thu, 21 Jun 2018 21:32:10 +0800
+Subject: arm64: dts: rockchip: add some common pin-settings to rk3399
+
+Those pins would be used by many boards.
+
+Signed-off-by: Randy Li <ayaka@soulik.info>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+---
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 86 ++++++++++++++++++++++++++------
+ 1 file changed, 72 insertions(+), 14 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+index adb037cd80fe..87350c694b38 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+@@ -1923,19 +1923,49 @@
+ 			drive-strength = <12>;
+ 		};
+ 
++		pcfg_pull_none_13ma: pcfg-pull-none-13ma {
++			bias-disable;
++			drive-strength = <13>;
++		};
++
++		pcfg_pull_none_18ma: pcfg-pull-none-18ma {
++			bias-disable;
++			drive-strength = <18>;
++		};
++
++		pcfg_pull_none_20ma: pcfg-pull-none-20ma {
++			bias-disable;
++			drive-strength = <20>;
++		};
++
++		pcfg_pull_up_2ma: pcfg-pull-up-2ma {
++			bias-pull-up;
++			drive-strength = <2>;
++		};
++
+ 		pcfg_pull_up_8ma: pcfg-pull-up-8ma {
+ 			bias-pull-up;
+ 			drive-strength = <8>;
+ 		};
+ 
++		pcfg_pull_up_18ma: pcfg-pull-up-18ma {
++			bias-pull-up;
++			drive-strength = <18>;
++		};
++
++		pcfg_pull_up_20ma: pcfg-pull-up-20ma {
++			bias-pull-up;
++			drive-strength = <20>;
++		};
++
+ 		pcfg_pull_down_4ma: pcfg-pull-down-4ma {
+ 			bias-pull-down;
+ 			drive-strength = <4>;
+ 		};
+ 
+-		pcfg_pull_up_2ma: pcfg-pull-up-2ma {
+-			bias-pull-up;
+-			drive-strength = <2>;
++		pcfg_pull_down_8ma: pcfg-pull-down-8ma {
++			bias-pull-down;
++			drive-strength = <8>;
+ 		};
+ 
+ 		pcfg_pull_down_12ma: pcfg-pull-down-12ma {
+@@ -1943,9 +1973,22 @@
+ 			drive-strength = <12>;
+ 		};
+ 
+-		pcfg_pull_none_13ma: pcfg-pull-none-13ma {
+-			bias-disable;
+-			drive-strength = <13>;
++		pcfg_pull_down_18ma: pcfg-pull-down-18ma {
++			bias-pull-down;
++			drive-strength = <18>;
++		};
++
++		pcfg_pull_down_20ma: pcfg-pull-down-20ma {
++			bias-pull-down;
++			drive-strength = <20>;
++		};
++
++		pcfg_output_high: pcfg-output-high {
++			output-high;
++		};
++
++		pcfg_output_low: pcfg-output-low {
++			output-low;
+ 		};
+ 
+ 		clock {
+@@ -2468,45 +2511,60 @@
+ 		pwm0 {
+ 			pwm0_pin: pwm0-pin {
+ 				rockchip,pins =
+-					<4 18 RK_FUNC_1 &pcfg_pull_none>;
++					<4 RK_PC2 RK_FUNC_1 &pcfg_pull_none>;
++			};
++
++			pwm0_pin_pull_down: pwm0-pin-pull-down {
++				rockchip,pins =
++					<4 RK_PC2 RK_FUNC_1 &pcfg_pull_down>;
+ 			};
+ 
+ 			vop0_pwm_pin: vop0-pwm-pin {
+ 				rockchip,pins =
+-					<4 18 RK_FUNC_2 &pcfg_pull_none>;
++					<4 RK_PC2 RK_FUNC_2 &pcfg_pull_none>;
++			};
++
++			vop1_pwm_pin: vop1-pwm-pin {
++				rockchip,pins =
++					<4 RK_PC2 RK_FUNC_3 &pcfg_pull_none>;
+ 			};
+ 		};
+ 
+ 		pwm1 {
+ 			pwm1_pin: pwm1-pin {
+ 				rockchip,pins =
+-					<4 22 RK_FUNC_1 &pcfg_pull_none>;
++					<4 RK_PC6 RK_FUNC_1 &pcfg_pull_none>;
+ 			};
+ 
+-			vop1_pwm_pin: vop1-pwm-pin {
++			pwm1_pin_pull_down: pwm1-pin-pull-down {
+ 				rockchip,pins =
+-					<4 18 RK_FUNC_3 &pcfg_pull_none>;
++					<4 RK_PC6 RK_FUNC_1 &pcfg_pull_down>;
+ 			};
+ 		};
+ 
+ 		pwm2 {
+ 			pwm2_pin: pwm2-pin {
+ 				rockchip,pins =
+-					<1 19 RK_FUNC_1 &pcfg_pull_none>;
++					<1 RK_PC3 RK_FUNC_1 &pcfg_pull_none>;
++			};
++
++			pwm2_pin_pull_down: pwm2-pin-pull-down {
++				rockchip,pins =
++					<1 RK_PC3 RK_FUNC_1 &pcfg_pull_down>;
+ 			};
+ 		};
+ 
+ 		pwm3a {
+ 			pwm3a_pin: pwm3a-pin {
+ 				rockchip,pins =
+-					<0 6 RK_FUNC_1 &pcfg_pull_none>;
++					<0 RK_PA6 RK_FUNC_1 &pcfg_pull_none>;
+ 			};
+ 		};
+ 
+ 		pwm3b {
+ 			pwm3b_pin: pwm3b-pin {
+ 				rockchip,pins =
+-					<1 14 RK_FUNC_1 &pcfg_pull_none>;
++					<1 RK_PB6 RK_FUNC_1 &pcfg_pull_none>;
+ 			};
+ 		};
+ 
+-- 
+cgit 1.2-0.3.lf.el7
 From 7c41a3f42a51d88e271c989c16be178bd6d38dfe Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Mon, 10 Sep 2018 18:17:36 +0100
diff --git a/kernel.spec b/kernel.spec
index eca64f2..06741d3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -601,8 +601,8 @@ Patch312: usb-dwc2-Turn-on-uframe-sched-everywhere.patch
 
 Patch313: arm64-dts-marvell-a3700-reserve-ATF-memory.patch
 
-#Patch315: arm64-96boards-RK3399-Ficus-board.patch
-#Patch316: arm64-96boards-Rock960-CE-board-support.patch
+Patch315: arm64-96boards-RK3399-Ficus-board.patch
+Patch316: arm64-96boards-Rock960-CE-board-support.patch
 
 Patch317: arm64-drm-msm-fix-missing-CTL-flush.patch