aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>2020-03-05 12:10:47 +0100
committerArnd Bergmann <arnd@arndb.de>2020-07-17 08:57:02 +0200
commit67c70aa86f8b796c45a08e0c955dabd826f6d0c6 (patch)
treef818eb863e5ebc4ee5d4a75d7ae385315d520486 /arch/arm/configs/multi_v7_defconfig
parentarm64: defconfig: enable CONFIG_FSL_ENETC_QOS (diff)
downloadlinux-dev-67c70aa86f8b796c45a08e0c955dabd826f6d0c6.tar.xz
linux-dev-67c70aa86f8b796c45a08e0c955dabd826f6d0c6.zip
arm/arm64: defconfig: Update configs to use the new CROS_EC options
We refactored the CrOS EC drivers moving part of the code from the MFD subsystem to the platform chrome subsystem. During this change we needed to rename some config options, so, update the defconfigs accordingly. Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Gwendal Grignou <gwendal@chromium.org> Tested-by: Gwendal Grignou <gwendal@chromium.org> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index f6dbbdc4be9c..e9e76e32f10f 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -951,7 +951,7 @@ CONFIG_SERIO_NVEC_PS2=y
CONFIG_NVEC_POWER=y
CONFIG_NVEC_PAZ00=y
CONFIG_STAGING_BOARD=y
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_SPI=m
CONFIG_COMMON_CLK_MAX77686=y
@@ -1132,3 +1132,6 @@ CONFIG_CMA_SIZE_MBYTES=64
CONFIG_PRINTK_TIME=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_CHARDEV=m