Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5238b41 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Lee Jones
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 90f44717

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/gpio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/mfd/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -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

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/platform/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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