diff --git a/CHANGELOG.md b/CHANGELOG.md
index 948dfd5..d183ff3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Change log
 -----------
 
+* linux-mainline: Update kernel to 4.17.3 version for OrangePi Plus2 [Sebastian]
 * linux-mainline: Activate USB_SERIAL_PL2303 kernel module for OrangePi-Plus2 [Sebastian]
 * linux-mainline: Enable i2c0 in OrangePi-Plus2 device tree [Sebastian]
 
diff --git a/layers/meta-resin-allwinner/conf/machine/orangepi-plus2.conf b/layers/meta-resin-allwinner/conf/machine/orangepi-plus2.conf
index cfc042b..f4d6eff 100644
--- a/layers/meta-resin-allwinner/conf/machine/orangepi-plus2.conf
+++ b/layers/meta-resin-allwinner/conf/machine/orangepi-plus2.conf
@@ -6,4 +6,4 @@ require conf/machine/include/sun8i.inc
 
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-plus.dtb"
 UBOOT_MACHINE = "orangepi_plus_defconfig"
-PREFERRED_VERSION_linux-mainline = "4.15.18"
+PREFERRED_VERSION_linux-mainline = "4.17.3"
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Enable-i2c0-on-OrangePi-Plus2-board.patch b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Enable-i2c0-on-OrangePi-Plus2-board.patch
new file mode 100644
index 0000000..011064f
--- /dev/null
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Enable-i2c0-on-OrangePi-Plus2-board.patch
@@ -0,0 +1,26 @@
+From cef44d8fd32cf32dc3760ba2cf520467df7585d6 Mon Sep 17 00:00:00 2001
+From: Sebastian Panceac <sebastian@resin.io>
+Date: Wed, 20 Jun 2018 11:15:30 +0200
+Subject: [PATCH] Enable i2c0 on OrangePi Plus2 board
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Sebastian Panceac <sebastian@resin.io>
+---
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+index b403e5d..781b6c4 100644
+--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
++++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
+@@ -122,3 +122,7 @@
+ &usbphy {
+ 	usb3_vbus-supply = <&reg_usb3_vbus>;
+ };
++
++&i2c0 {
++	status = "okay";
++};
+-- 
+2.7.4
+
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.15.18/defconfig b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/defconfig
similarity index 100%
rename from layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.15.18/defconfig
rename to layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/defconfig
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.15.18/don-t-default-activate-regdb.patch b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/don-t-default-activate-regdb.patch
similarity index 100%
rename from layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.15.18/don-t-default-activate-regdb.patch
rename to layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/don-t-default-activate-regdb.patch
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
index 86e3f01..c49c900 100644
--- a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
@@ -28,3 +28,11 @@ RESIN_CONFIGS_DEPS[pl2303] = "\
 RESIN_CONFIGS[pl2303] ="\
     CONFIG_USB_SERIAL_PL2303=m \
 "
+
+RESIN_CONFIGS_append_orangepi-plus2 = " hdmi"
+RESIN_CONFIGS_DEPS[hdmi] = "\
+    CONFIG_SUN8I_DE2_CCU=y \
+"
+RESIN_CONFIGS[hdmi] ="\
+    CONFIG_DRM_SUN8I_DW_HDMI=y \
+"
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_4.15.18.bb b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_4.17.3.bb
similarity index 84%
rename from layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_4.15.18.bb
rename to layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_4.17.3.bb
index 6953199..20d27ac 100644
--- a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_4.15.18.bb
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_4.17.3.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Mainline Linux kernel"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
 
 inherit kernel
@@ -17,7 +17,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 	
-SRC_URI[md5sum] = "2c7a9404ddf29580f14c61eb87e50c6e"
+SRC_URI[md5sum] = "a5899b46a3d146c65bc2ba724db2f4ca"
 
 SRC_URI = "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
 	   file://defconfig \