From 1cd75a53e928cac8d8809bbeebd45511c78d597d Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 5 Mar 2020 19:05:34 +0800 Subject: [PATCH] arm64: rockchip_defconfig: update by savedefconfig Reorder some configs. Change-Id: Ibe56218d9577c73a9f97a7c2e7aa4ff2c6a4a67b Signed-off-by: Tao Huang --- arch/arm64/configs/rockchip_defconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index 051f97af2aeb..5c7f0ebe3589 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -538,11 +538,11 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_ISP1=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set +CONFIG_VIDEO_VM149C=y CONFIG_VIDEO_OV13850=y CONFIG_VIDEO_GC0312=y CONFIG_VIDEO_GC2145=y CONFIG_VIDEO_GC2355=y -CONFIG_VIDEO_VM149C=y CONFIG_VIDEO_SGM3784=y # CONFIG_VGA_ARB is not set CONFIG_DRM=y @@ -559,7 +559,6 @@ CONFIG_ROCKCHIP_LVDS=y CONFIG_ROCKCHIP_DRM_TVE=y CONFIG_ROCKCHIP_RGB=y CONFIG_ROCKCHIP_DRM_BACKLIGHT=y -CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y CONFIG_DRM_ROCKCHIP_RK618=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_RK1000=y @@ -793,13 +792,13 @@ CONFIG_ANDROID_VERSION=0x08000000 CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y CONFIG_ROCKCHIP_SUSPEND_MODE=y +CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y CONFIG_PM_DEVFREQ=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ=y CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y -CONFIG_PM_DEVFREQ_EVENT=y CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=y CONFIG_IIO=y CONFIG_IIO_BUFFER=y @@ -811,8 +810,8 @@ CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_DP=y CONFIG_PHY_ROCKCHIP_EMMC=y -CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY=y CONFIG_PHY_ROCKCHIP_INNO_HDMI_PHY=y +CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_INNO_USB3=y CONFIG_PHY_ROCKCHIP_INNO_VIDEO_COMBO_PHY=y