Crystal Cove and Whiskey Cove are two different PMICs which are installed on Intel Atom SoC based platforms.
Moreover there are two independent drivers that by some reason got into one kernel module. Fix the mess by clatifying Kconfig option for Crystal Cove and split Whiskey Cove out of it. Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com> --- drivers/mfd/Kconfig | 4 ++-- drivers/mfd/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 55ecdfb74d31..b121820be19c 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -425,14 +425,14 @@ config LPC_SCH System Management Bus and General Purpose I/O. config INTEL_SOC_PMIC - bool "Support for Intel Atom SoC PMIC" + bool "Support for Crystal Cove PMIC" depends on GPIOLIB depends on I2C=y select MFD_CORE select REGMAP_I2C select REGMAP_IRQ help - Select this option to enable support for the PMIC device + Select this option to enable support for Crystal Cove PMIC on some Intel SoC systems. The PMIC provides ADC, GPIO, thermal, charger and related power management functions on these systems. diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 31ce07611a6f..afc9401de46b 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -207,8 +207,8 @@ obj-$(CONFIG_MFD_RT5033) += rt5033.o obj-$(CONFIG_MFD_SKY81452) += sky81452.o intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o -intel-soc-pmic-$(CONFIG_INTEL_PMC_IPC) += intel_soc_pmic_bxtwc.o obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o +obj-$(CONFIG_INTEL_PMC_IPC) += intel_soc_pmic_bxtwc.o obj-$(CONFIG_MFD_MT6397) += mt6397-core.o obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o -- 2.11.0