| Message ID | 20190614163635.22413-11-enric.balletbo@collabora.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On Fri, 14 Jun 2019 at 18:37, Enric Balletbo i Serra <enric.balletbo@collabora.com> wrote: > > Recently 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> > --- > > Changes in v2: None > > arch/arm/configs/exynos_defconfig | 4 +++- > arch/arm/configs/multi_v7_defconfig | 6 ++++-- > arch/arm/configs/pxa_defconfig | 4 +++- > arch/arm64/configs/defconfig | 6 ++++-- > 4 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig > index c95c54284da2..03448fba569f 100644 > --- a/arch/arm/configs/exynos_defconfig > +++ b/arch/arm/configs/exynos_defconfig > @@ -154,7 +154,9 @@ CONFIG_CPU_THERMAL=y > CONFIG_THERMAL_EMULATION=y > CONFIG_WATCHDOG=y > CONFIG_S3C2410_WATCHDOG=y > -CONFIG_MFD_CROS_EC=y > +CONFIG_MFD_CROS_EC_DEV=y > +CONFIG_CHROME_PLATFORMS=y > +CONFIG_CROS_EC=y > CONFIG_CROS_EC_I2C=y > CONFIG_CROS_EC_SPI=y > CONFIG_MFD_MAX14577=y If you want to take it through mfd, arm-soc or other tree: For Exynos: Acked-by: Krzysztof Kozlowski <krzk@kernel.org> Otherwise I could take exynos/multi_v7/arm64 changes but split per arm v7/v8. Best regards, Krzysztof > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > index 6b748f214eae..9fe783abf3c5 100644 > --- a/arch/arm/configs/multi_v7_defconfig > +++ b/arch/arm/configs/multi_v7_defconfig > @@ -510,10 +510,12 @@ CONFIG_MFD_BCM590XX=y > CONFIG_MFD_AC100=y > CONFIG_MFD_AXP20X_I2C=y > CONFIG_MFD_AXP20X_RSB=y > -CONFIG_MFD_CROS_EC=m > +CONFIG_MFD_CROS_EC_DEV=m > +CONFIG_CHROME_PLATFORMS=y > +CONFIG_CROS_EC=m > CONFIG_CROS_EC_I2C=m > CONFIG_CROS_EC_SPI=m > -CONFIG_MFD_CROS_EC_CHARDEV=m > +CONFIG_CROS_EC_CHARDEV=m > CONFIG_MFD_DA9063=m > CONFIG_MFD_MAX14577=y > CONFIG_MFD_MAX77686=y > diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig > index 07ebbdce3645..e335b986cf70 100644 > --- a/arch/arm/configs/pxa_defconfig > +++ b/arch/arm/configs/pxa_defconfig > @@ -394,7 +394,9 @@ CONFIG_SA1100_WATCHDOG=m > CONFIG_MFD_AS3711=y > CONFIG_MFD_BCM590XX=m > CONFIG_MFD_AXP20X=y > -CONFIG_MFD_CROS_EC=m > +CONFIG_MFD_CROS_EC_DEV=m > +CONFIG_CHROME_PLATFORMS=y > +CONFIG_CROS_EC=m > CONFIG_CROS_EC_I2C=m > CONFIG_CROS_EC_SPI=m > CONFIG_MFD_ASIC3=y > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index 4d583514258c..b5bba5f04082 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -430,8 +430,7 @@ CONFIG_MFD_ALTERA_SYSMGR=y > CONFIG_MFD_BD9571MWV=y > CONFIG_MFD_AXP20X_I2C=y > CONFIG_MFD_AXP20X_RSB=y > -CONFIG_MFD_CROS_EC=y > -CONFIG_MFD_CROS_EC_CHARDEV=m > +CONFIG_MFD_CROS_EC_DEV=y > CONFIG_MFD_EXYNOS_LPASS=m > CONFIG_MFD_HI6421_PMIC=y > CONFIG_MFD_HI655X_PMIC=y > @@ -631,8 +630,11 @@ CONFIG_VIRTIO_BALLOON=y > CONFIG_VIRTIO_MMIO=y > CONFIG_XEN_GNTDEV=y > CONFIG_XEN_GRANT_DEV_ALLOC=y > +CONFIG_CHROME_PLATFORMS=y > +CONFIG_CROS_EC=y > CONFIG_CROS_EC_I2C=y > CONFIG_CROS_EC_SPI=y > +CONFIG_CROS_EC_CHARDEV=m > CONFIG_COMMON_CLK_RK808=y > CONFIG_COMMON_CLK_SCPI=y > CONFIG_COMMON_CLK_CS2000_CP=y > -- > 2.20.1 >
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index c95c54284da2..03448fba569f 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -154,7 +154,9 @@ CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y -CONFIG_MFD_CROS_EC=y +CONFIG_MFD_CROS_EC_DEV=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_SPI=y CONFIG_MFD_MAX14577=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6b748f214eae..9fe783abf3c5 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -510,10 +510,12 @@ CONFIG_MFD_BCM590XX=y CONFIG_MFD_AC100=y CONFIG_MFD_AXP20X_I2C=y CONFIG_MFD_AXP20X_RSB=y -CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_DEV=m +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=m CONFIG_CROS_EC_I2C=m CONFIG_CROS_EC_SPI=m -CONFIG_MFD_CROS_EC_CHARDEV=m +CONFIG_CROS_EC_CHARDEV=m CONFIG_MFD_DA9063=m CONFIG_MFD_MAX14577=y CONFIG_MFD_MAX77686=y diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 07ebbdce3645..e335b986cf70 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -394,7 +394,9 @@ CONFIG_SA1100_WATCHDOG=m CONFIG_MFD_AS3711=y CONFIG_MFD_BCM590XX=m CONFIG_MFD_AXP20X=y -CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_DEV=m +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=m CONFIG_CROS_EC_I2C=m CONFIG_CROS_EC_SPI=m CONFIG_MFD_ASIC3=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 4d583514258c..b5bba5f04082 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -430,8 +430,7 @@ CONFIG_MFD_ALTERA_SYSMGR=y CONFIG_MFD_BD9571MWV=y CONFIG_MFD_AXP20X_I2C=y CONFIG_MFD_AXP20X_RSB=y -CONFIG_MFD_CROS_EC=y -CONFIG_MFD_CROS_EC_CHARDEV=m +CONFIG_MFD_CROS_EC_DEV=y CONFIG_MFD_EXYNOS_LPASS=m CONFIG_MFD_HI6421_PMIC=y CONFIG_MFD_HI655X_PMIC=y @@ -631,8 +630,11 @@ CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_MMIO=y CONFIG_XEN_GNTDEV=y CONFIG_XEN_GRANT_DEV_ALLOC=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_SPI=y +CONFIG_CROS_EC_CHARDEV=m CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_SCPI=y CONFIG_COMMON_CLK_CS2000_CP=y
Recently 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> --- Changes in v2: None arch/arm/configs/exynos_defconfig | 4 +++- arch/arm/configs/multi_v7_defconfig | 6 ++++-- arch/arm/configs/pxa_defconfig | 4 +++- arch/arm64/configs/defconfig | 6 ++++-- 4 files changed, 14 insertions(+), 6 deletions(-)