diff --git a/arch/arm/configs/rockchip_linux_defconfig b/arch/arm/configs/rockchip_linux_defconfig
index 64bfa859df7b..b76d47e8528e 100644
--- a/arch/arm/configs/rockchip_linux_defconfig
+++ b/arch/arm/configs/rockchip_linux_defconfig
@@ -33,9 +33,6 @@ CONFIG_SMP=y
 CONFIG_ARM_PSCI=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
-CONFIG_SECCOMP=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
@@ -67,7 +64,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CMA=y
 CONFIG_ZSMALLOC=y
-CONFIG_PGTABLE_MAPPING=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -123,7 +119,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_MANGLE=y
-CONFIG_NF_NAT_IPV6=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MATCH_IPV6HEADER=y
 CONFIG_IP6_NF_FILTER=y
@@ -159,7 +154,6 @@ CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEBUG_DEVRES=y
-CONFIG_DMA_CMA=y
 CONFIG_CONNECTOR=y
 CONFIG_ZRAM=y
 CONFIG_BLK_DEV_LOOP=y
@@ -203,14 +197,12 @@ CONFIG_RT2X00=y
 CONFIG_RT2800USB=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
-CONFIG_AP6XXX=m
 CONFIG_USB_NET_RNDIS_WLAN=y
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_ADC=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_GPIO_POLLED=y
-CONFIG_KEYBOARD_CROS_EC=y
 # CONFIG_MOUSE_PS2 is not set
 CONFIG_MOUSE_CYAPA=y
 CONFIG_MOUSE_ELAN_I2C=y
@@ -223,9 +215,8 @@ CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=y
-CONFIG_TOUCHSCREEN_GSLX680_D708=y
 CONFIG_TOUCHSCREEN_GSL3673=y
-CONFIG_TOUCHSCREEN_GT9XX=y
+CONFIG_TOUCHSCREEN_GT1X=y
 CONFIG_TOUCHSCREEN_ELAN=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
 CONFIG_INPUT_MISC=y
@@ -245,7 +236,6 @@ CONFIG_TCG_TPM=y
 CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_RK3X=y
-CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_STUB=m
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
@@ -265,7 +255,6 @@ CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_ROCKCHIP_THERMAL=y
-CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_RK808=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
@@ -277,28 +266,18 @@ CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_TPS6586X=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=y
 # CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set
 # CONFIG_USB_GSPCA is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=y
 CONFIG_VIDEO_ROCKCHIP_CIF=y
-CONFIG_VIDEO_ROCKCHIP_ISP1=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_V4L_TEST_DRIVERS=y
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-CONFIG_VIDEO_VM149C=y
 CONFIG_VIDEO_IMX219=y
 CONFIG_VIDEO_OV5647=y
 CONFIG_VIDEO_OV8858=y
 CONFIG_VIDEO_OV13850=y
-CONFIG_VIDEO_GC0312=y
-CONFIG_VIDEO_GC2035=y
 CONFIG_VIDEO_SGM3784=y
 CONFIG_DRM=y
 CONFIG_DRM_IGNORE_IOTCL_PERMIT=y
@@ -309,7 +288,6 @@ CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
-CONFIG_ROCKCHIP_DRM_TVE=y
 CONFIG_ROCKCHIP_RGB=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
@@ -325,13 +303,13 @@ CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
 CONFIG_MALI_PWRSOFT_765=y
 CONFIG_FB_MODE_HELPERS=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
-CONFIG_ROCKCHIP_RGA2=y
+CONFIG_ROCKCHIP_MULTI_RGA=y
+CONFIG_IEP=y
 CONFIG_ROCKCHIP_MPP_SERVICE=y
 CONFIG_ROCKCHIP_MPP_RKVDEC=y
+CONFIG_ROCKCHIP_MPP_RKVENC=y
 CONFIG_ROCKCHIP_MPP_VDPU1=y
 CONFIG_ROCKCHIP_MPP_VEPU1=y
 CONFIG_ROCKCHIP_MPP_VDPU2=y
@@ -435,6 +413,9 @@ CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_CPU_RK312X=y
+CONFIG_CPU_RK3036=y
+CONFIG_CPU_RK30XX=y
+CONFIG_CPU_RK3188=y
 CONFIG_CPU_RK3288=y
 CONFIG_CPU_RK322X=y
 CONFIG_ROCKCHIP_CPUINFO=y
@@ -455,9 +436,6 @@ CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y
 CONFIG_EXTCON=y
 CONFIG_MEMORY=y
 CONFIG_IIO=y
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_KFIFO_BUF=y
-CONFIG_IIO_TRIGGER=y
 CONFIG_ROCKCHIP_SARADC=y
 CONFIG_SENSORS_ISL29018=y
 CONFIG_SENSORS_TSL2563=y
@@ -520,17 +498,18 @@ CONFIG_CRC7=y
 # CONFIG_XZ_DEC_POWERPC is not set
 # CONFIG_XZ_DEC_IA64 is not set
 # CONFIG_XZ_DEC_SPARC is not set
+CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0
-CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_STACK_END_CHECK=y
+CONFIG_SCHEDSTATS=y
 CONFIG_DEBUG_SPINLOCK=y
+CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_DEBUG_CREDENTIALS=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_FUNCTION_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_RUNTIME_TESTING_MENU is not set
-CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_STRICT_DEVMEM=y
+# CONFIG_RUNTIME_TESTING_MENU is not set