mfd: intel_soc_pmic: Fix a mess with compilation units

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 were
supposed (*) to get into one kernel module.

Fix the mess by clarifying Kconfig option for Crystal Cove and split
Whiskey Cove out of it.

(*) It looks like the configuration was never tested with
    INTEL_SOC_PMIC=n. The line in Makefile is actually wrong.

Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> (supporter:ACPI)
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 83e5f7e1a20d3f7c9fcfd3822f9102673f7c12e5..03708e08fcb42bea956eb93498ca67c5fd77337a 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -512,7 +512,7 @@ config XPOWER_PMIC_OPREGION
 
 config BXT_WC_PMIC_OPREGION
        bool "ACPI operation region support for BXT WhiskeyCove PMIC"
-       depends on INTEL_SOC_PMIC
+       depends on INTEL_SOC_PMIC_BXTWC
        help
          This config adds ACPI operation region support for BXT WhiskeyCove PMIC.
 

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 05043071fc9805e1b9595090450f405ab28c22db..9b1bcb4d0df731f1a2cf8ad13d95037cb7dfcb87 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1054,7 +1054,7 @@ config GPIO_UCB1400
 
 config GPIO_WHISKEY_COVE
        tristate "GPIO support for Whiskey Cove PMIC"
-       depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC
+       depends on (X86 || COMPILE_TEST) && INTEL_SOC_PMIC_BXTWC
        select GPIOLIB_IRQCHIP
        help
          Support for GPIO pins on Whiskey Cove PMIC.

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index de68b5ba87410d2b0eb5bbe8c2e2a413deb13721..3eb5c93595f66f0311b73faf65b9c4716044ecff 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -447,18 +447,29 @@ 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.
 
+config INTEL_SOC_PMIC_BXTWC
+       tristate "Support for Intel Broxton Whiskey Cove PMIC"
+       depends on INTEL_PMC_IPC
+       select MFD_CORE
+       select REGMAP_IRQ
+       help
+         Select this option to enable support for Whiskey Cove PMIC
+         on Intel Broxton systems. The PMIC provides ADC, GPIO,
+         thermal, charger and related power management functions
+         on these systems.
+
 config MFD_INTEL_LPSS
        tristate
        select COMMON_CLK

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index fa86dbe65e52115dbcad3379f17d0f8a61cbd366..c16bf1ea0ea9b0a4432539b228a4a48744ac0599 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -212,8 +212,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_SOC_PMIC_BXTWC)     += intel_soc_pmic_bxtwc.o
 obj-$(CONFIG_MFD_MT6397)       += mt6397-core.o
 
 obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 4bc88eb52712c7a8231ac64b94bbfacd5607f1f5..9a949d5311627da2256b50aa9a558e71f9c21e16 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1011,7 +1011,7 @@ config INTEL_PMC_IPC
 config INTEL_BXTWC_PMIC_TMU
        tristate "Intel BXT Whiskey Cove TMU Driver"
        depends on REGMAP
-       depends on INTEL_SOC_PMIC && INTEL_PMC_IPC
+       depends on INTEL_SOC_PMIC_BXTWC && INTEL_PMC_IPC
        ---help---
          Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature.
          This driver enables the alarm wakeup functionality in the TMU unit

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 776b34396144a4612ec5ebfff5a549be9f6e33ca..751e50a3d946ecb844af7f0104d31435bb3c58b3 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -365,7 +365,7 @@ endmenu
 
 config INTEL_BXT_PMIC_THERMAL
        tristate "Intel Broxton PMIC thermal driver"
-       depends on X86 && INTEL_SOC_PMIC && REGMAP
+       depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP
        help
          Select this driver for Intel Broxton PMIC with ADC channels monitoring
          system temperature measurements and alerts.