diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 042b55b53331..ca02c1804e81 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -156,6 +156,7 @@ config ROCKCHIP_DW_HDCP2
 	  Choose this option to enable support for the Synopsys
 	  Designware HDCP2 Controller.
 
+source "drivers/gpu/drm/rockchip/rk618/Kconfig"
 source "drivers/gpu/drm/rockchip/rk628/Kconfig"
 
 endif
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index d0797bbccb23..97116e397de4 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -30,5 +30,5 @@ rockchipdrm-$(CONFIG_DRM_ROCKCHIP_VVOP) += rockchip_drm_vvop.o
 
 obj-$(CONFIG_ROCKCHIP_DW_HDCP2) += dw_hdcp2.o
 obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o
-
+obj-$(CONFIG_DRM_ROCKCHIP_RK618) += rk618/
 obj-$(CONFIG_DRM_ROCKCHIP_RK628) += rk628/
diff --git a/drivers/gpu/drm/rockchip/rk618/Kconfig b/drivers/gpu/drm/rockchip/rk618/Kconfig
index f81940b5b055..03ae305a93c1 100644
--- a/drivers/gpu/drm/rockchip/rk618/Kconfig
+++ b/drivers/gpu/drm/rockchip/rk618/Kconfig
@@ -5,5 +5,6 @@ config DRM_ROCKCHIP_RK618
 	depends on DRM_ROCKCHIP
 	depends on MFD_RK618
 	select DRM_PANEL
+	select DRM_MIPI_DSI
 	help
 	  Rockchip rk618 display bridge chips driver.
diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.c b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c
index ab1bbe9cee4e..a9bc0c37c2d6 100644
--- a/drivers/gpu/drm/rockchip/rk618/rk618_dither.c
+++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c
@@ -5,6 +5,7 @@
  * Author: Wyon Bi <bivvy.bi@rock-chips.com>
  */
 
+#include <linux/module.h>
 #include "rk618_dither.h"
 
 #define RK618_FRC_REG			0x0054
@@ -48,3 +49,5 @@ void rk618_frc_dclk_invert(struct rk618 *rk618)
 	regmap_write(rk618->regmap, RK618_FRC_REG, FRC_DCLK_INV);
 }
 EXPORT_SYMBOL_GPL(rk618_frc_dclk_invert);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 66971f15b727..9d3d6ca083c2 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1151,6 +1151,16 @@ config MFD_RC5T583
 	  Additional drivers must be enabled in order to use the
 	  different functionality of the device.
 
+config MFD_RK618
+	tristate "Rockchip RK618 MFD Driver"
+	depends on I2C
+	depends on OF
+	select MFD_CORE
+	select REGMAP_I2C
+	select REGMAP_IRQ
+	help
+	  if you say yes here you get support for the RK618 from Rockchip.
+
 config MFD_RK628
 	tristate "Rockchip RK628 MFD Driver"
 	depends on I2C
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index e369698ee720..6ae9047e3652 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -223,6 +223,7 @@ obj-$(CONFIG_MFD_INTEL_PMC_BXT)	+= intel_pmc_bxt.o
 obj-$(CONFIG_MFD_PALMAS)	+= palmas.o
 obj-$(CONFIG_MFD_VIPERBOARD)    += viperboard.o
 obj-$(CONFIG_MFD_RC5T583)	+= rc5t583.o rc5t583-irq.o
+obj-$(CONFIG_MFD_RK618)		+= rk618.o
 obj-$(CONFIG_MFD_RK628)		+= rk628.o
 obj-$(CONFIG_MFD_RK630)		+= rk630.o
 obj-$(CONFIG_MFD_RK630_I2C)	+= rk630-i2c.o