Skip to content

Commit 67c70aa

Browse files
Enric Balletbo i Serraarndb
authored andcommitted
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 <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Gwendal Grignou <[email protected]> Tested-by: Gwendal Grignou <[email protected]> Acked-by: Lee Jones <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 54ae105 commit 67c70aa

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

arch/arm/configs/exynos_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ CONFIG_DEVFREQ_THERMAL=y
166166
CONFIG_THERMAL_EMULATION=y
167167
CONFIG_WATCHDOG=y
168168
CONFIG_S3C2410_WATCHDOG=y
169-
CONFIG_MFD_CROS_EC=y
169+
CONFIG_MFD_CROS_EC_DEV=y
170+
CONFIG_CHROME_PLATFORMS=y
171+
CONFIG_CROS_EC=y
170172
CONFIG_MFD_MAX14577=y
171173
CONFIG_MFD_MAX77686=y
172174
CONFIG_MFD_MAX77693=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ CONFIG_SERIO_NVEC_PS2=y
951951
CONFIG_NVEC_POWER=y
952952
CONFIG_NVEC_PAZ00=y
953953
CONFIG_STAGING_BOARD=y
954-
CONFIG_MFD_CROS_EC=m
954+
CONFIG_MFD_CROS_EC_DEV=m
955955
CONFIG_CROS_EC_I2C=m
956956
CONFIG_CROS_EC_SPI=m
957957
CONFIG_COMMON_CLK_MAX77686=y
@@ -1132,3 +1132,6 @@ CONFIG_CMA_SIZE_MBYTES=64
11321132
CONFIG_PRINTK_TIME=y
11331133
CONFIG_MAGIC_SYSRQ=y
11341134
CONFIG_DEBUG_FS=y
1135+
CONFIG_CHROME_PLATFORMS=y
1136+
CONFIG_CROS_EC=m
1137+
CONFIG_CROS_EC_CHARDEV=m

arch/arm/configs/pxa_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,9 @@ CONFIG_SA1100_WATCHDOG=m
391391
CONFIG_MFD_AS3711=y
392392
CONFIG_MFD_BCM590XX=m
393393
CONFIG_MFD_AXP20X=y
394-
CONFIG_MFD_CROS_EC=m
394+
CONFIG_MFD_CROS_EC_DEV=m
395+
CONFIG_CHROME_PLATFORMS=y
396+
CONFIG_CROS_EC=m
395397
CONFIG_CROS_EC_I2C=m
396398
CONFIG_CROS_EC_SPI=m
397399
CONFIG_MFD_ASIC3=y

arch/arm/configs/tegra_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ CONFIG_SENSORS_LM95245=y
148148
CONFIG_WATCHDOG=y
149149
CONFIG_TEGRA_WATCHDOG=y
150150
CONFIG_MFD_AS3722=y
151-
CONFIG_MFD_CROS_EC=y
151+
CONFIG_MFD_CROS_EC_DEV=y
152152
CONFIG_MFD_MAX8907=y
153153
CONFIG_MFD_STMPE=y
154154
CONFIG_MFD_PALMAS=y

arch/arm64/configs/defconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,9 +806,12 @@ CONFIG_VIRTIO_BALLOON=y
806806
CONFIG_VIRTIO_MMIO=y
807807
CONFIG_XEN_GNTDEV=y
808808
CONFIG_XEN_GRANT_DEV_ALLOC=y
809-
CONFIG_MFD_CROS_EC=y
809+
CONFIG_MFD_CROS_EC_DEV=y
810+
CONFIG_CHROME_PLATFORMS=y
811+
CONFIG_CROS_EC=y
810812
CONFIG_CROS_EC_I2C=y
811813
CONFIG_CROS_EC_SPI=y
814+
CONFIG_CROS_EC_CHARDEV=m
812815
CONFIG_COMMON_CLK_RK808=y
813816
CONFIG_COMMON_CLK_SCPI=y
814817
CONFIG_COMMON_CLK_CS2000_CP=y

0 commit comments

Comments
 (0)