From 9ccfa45cf322a5e7fd5de1b401471ebe68e0fc6f Mon Sep 17 00:00:00 2001
From: Caesar Wang <wxt@rock-chips.com>
Date: Tue, 5 Jan 2021 18:00:26 +0800
Subject: [PATCH] arm64/configs: update rockchip_linux_defconfig

1/ enable sii902x
Add RGB/BT1120 to HDMI support, this is needed by
rk3568-evb2-lp4x-v10-bt1120-to-hdmi.

2/ enable CONFIG_SDIO_KEEPALIVE
This is needed by RK356X EVB to support Wi-Fi.

3/ add rockchip ebc dev driver.

4/ remove unused CONFIG_I2C_MUX.

5/ enable CONFIG_PCIE_DW_ROCKCHIP for PCIE devices.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I3076aefab88fa2b166a8af89e8681fa46a69e7f9
---
 arch/arm64/configs/rockchip_linux_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig
index a4b3beded9e8..7e71aa4781a7 100644
--- a/arch/arm64/configs/rockchip_linux_defconfig
+++ b/arch/arm64/configs/rockchip_linux_defconfig
@@ -22,6 +22,7 @@ CONFIG_PROFILING=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
+CONFIG_PCIE_DW_ROCKCHIP=y
 # CONFIG_ARM64_ERRATUM_826319 is not set
 # CONFIG_ARM64_ERRATUM_827319 is not set
 # CONFIG_ARM64_ERRATUM_824069 is not set
@@ -233,7 +234,6 @@ CONFIG_HW_RANDOM_ROCKCHIP=y
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TIS_I2C_INFINEON=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
 CONFIG_I2C_RK3X=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SPI=y
@@ -316,7 +316,9 @@ CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_DRM_TVE=y
 CONFIG_ROCKCHIP_RGB=y
+CONFIG_ROCKCHIP_EBC_DEV=y
 CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_SII902X=y
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
 CONFIG_DRM_DW_HDMI_CEC=y
 CONFIG_MALI400=y
@@ -422,6 +424,7 @@ CONFIG_USB_CONFIGFS_F_UVC=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_TEST=y
+CONFIG_SDIO_KEEPALIVE=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y