From 782ea01b34a2ea5bc2c8f91e214ebe5db1779377 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sat, 29 Dec 2018 11:45:18 +0800 Subject: [PATCH] arm64: rockchip_linux_defconfig: update by savedefconfig Change-Id: I8c6e2b1c9f026b740188cab25dbd1557a085d3a4 Signed-off-by: Tao Huang --- arch/arm64/configs/rockchip_linux_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig index e5920d62c3e6..1c779a271ea6 100644 --- a/arch/arm64/configs/rockchip_linux_defconfig +++ b/arch/arm64/configs/rockchip_linux_defconfig @@ -278,8 +278,8 @@ CONFIG_REGULATOR_TPS6586X=y CONFIG_REGULATOR_XZ3216=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CEC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_IR_RC5_DECODER is not set @@ -311,7 +311,6 @@ CONFIG_VIDEO_OV13850=y CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DMA_SYNC=y -CONFIG_DRM_DW_HDMI_CEC=y CONFIG_DRM_ROCKCHIP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y @@ -322,6 +321,7 @@ CONFIG_ROCKCHIP_LVDS=y CONFIG_ROCKCHIP_DRM_TVE=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_DW_HDMI_I2S_AUDIO=y +CONFIG_DRM_DW_HDMI_CEC=y CONFIG_MALI400=y CONFIG_MALI450=y # CONFIG_MALI400_PROFILING is not set