From 12bc67cfc293e185a8813f7b1d1126e939e5d2db Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 4 Sep 2017 16:25:41 +0800 Subject: [PATCH] arm64: rockchip_defconfig: update by savedefconfig Change-Id: Ia2317032c2357c93374212aecf08e24558147adc Signed-off-by: Tao Huang --- arch/arm64/configs/rockchip_defconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index ccb5ad07b281..6b0837a1bf6f 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -389,9 +389,9 @@ CONFIG_INPUT_GPIO=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_NR_UARTS=5 CONFIG_SERIAL_8250_RUNTIME_UARTS=5 -# CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_DW=y # CONFIG_HW_RANDOM is not set CONFIG_I2C_CHARDEV=y @@ -422,7 +422,6 @@ CONFIG_DEVFREQ_THERMAL=y CONFIG_ROCKCHIP_THERMAL=y CONFIG_RK3368_THERMAL=y CONFIG_MFD_RK808=y -CONFIG_MFD_RK1000=y CONFIG_FUSB_30X=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y @@ -450,10 +449,8 @@ CONFIG_CAMSYS_MRV=y CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_ROCKCHIP=y -CONFIG_ROCKCHIP_DRM_RGA=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y -CONFIG_DRM_RK1000=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_INNO_HDMI=y @@ -461,6 +458,7 @@ CONFIG_ROCKCHIP_LVDS=y CONFIG_ROCKCHIP_DRM_TVE=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_DW_HDMI_I2S_AUDIO=y +CONFIG_DRM_RK1000=y CONFIG_MALI400=y CONFIG_MALI450=y # CONFIG_MALI400_PROFILING is not set