diff --git a/arch/arm/configs/rockchip_linux_defconfig b/arch/arm/configs/rockchip_linux_defconfig
index bacfec194171..0240a378355a 100644
--- a/arch/arm/configs/rockchip_linux_defconfig
+++ b/arch/arm/configs/rockchip_linux_defconfig
@@ -292,9 +292,9 @@ 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_VIDEO_ROCKCHIP_ISP1=y
 CONFIG_SOC_CAMERA=y
 CONFIG_VIDEO_RK_CIF_ISP10=y
+CONFIG_VIDEO_ROCKCHIP_ISP1=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_ROCKCHIP_RGA=y
 CONFIG_VIDEO_ROCKCHIP_VPU=y
@@ -437,13 +437,12 @@ CONFIG_COMMON_CLK_RK808=y
 CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_PM_DEVFREQ=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
-CONFIG_MEMORY=y
 CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_MEMORY=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_KFIFO_BUF=y