Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfd: intel_soc_pmic: Fix a mess with compilation units

Browse Source 
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>
This commit is contained in:
Andy Shevchenko 2017-04-04 15:38:56 +03:00 committed by Lee Jones
parent 90f447170c
commit b5238b4185
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/Kconfig
View File

@ -512,7 +512,7 @@ config XPOWER_PMIC_OPREGION
config BXT_WC_PMIC_OPREGION config BXT_WC_PMIC_OPREGION
bool "ACPI operation region support for BXT WhiskeyCove PMIC" bool "ACPI operation region support for BXT WhiskeyCove PMIC"
depends on INTEL_SOC_PMIC depends on INTEL_SOC_PMIC_BXTWC
help help
This config adds ACPI operation region support for BXT WhiskeyCove PMIC. This config adds ACPI operation region support for BXT WhiskeyCove PMIC.

2
drivers/gpio/Kconfig
View File

@ -1054,7 +1054,7 @@ config GPIO_UCB1400
config GPIO_WHISKEY_COVE config GPIO_WHISKEY_COVE
tristate "GPIO support for Whiskey Cove PMIC" 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 select GPIOLIB_IRQCHIP
help help
Support for GPIO pins on Whiskey Cove PMIC. Support for GPIO pins on Whiskey Cove PMIC.

15
drivers/mfd/Kconfig
View File

@ -447,18 +447,29 @@ config LPC_SCH
System Management Bus and General Purpose I/O. System Management Bus and General Purpose I/O.
config INTEL_SOC_PMIC config INTEL_SOC_PMIC
bool "Support for Intel Atom SoC PMIC" bool "Support for Crystal Cove PMIC"
depends on GPIOLIB depends on GPIOLIB
depends on I2C=y depends on I2C=y
select MFD_CORE select MFD_CORE
select REGMAP_I2C select REGMAP_I2C
select REGMAP_IRQ select REGMAP_IRQ
help 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, on some Intel SoC systems. The PMIC provides ADC, GPIO,
thermal, charger and related power management functions thermal, charger and related power management functions
on these systems. 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 config MFD_INTEL_LPSS
tristate tristate
select COMMON_CLK select COMMON_CLK

2
drivers/mfd/Makefile
View File

@ -212,8 +212,8 @@ obj-$(CONFIG_MFD_RT5033) += rt5033.o
obj-$(CONFIG_MFD_SKY81452) += sky81452.o obj-$(CONFIG_MFD_SKY81452) += sky81452.o
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.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) += 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_MT6397) += mt6397-core.o
obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o

2
drivers/platform/x86/Kconfig
View File

@ -1011,7 +1011,7 @@ config INTEL_PMC_IPC
config INTEL_BXTWC_PMIC_TMU config INTEL_BXTWC_PMIC_TMU
tristate "Intel BXT Whiskey Cove TMU Driver" tristate "Intel BXT Whiskey Cove TMU Driver"
depends on REGMAP depends on REGMAP
depends on INTEL_SOC_PMIC && INTEL_PMC_IPC depends on INTEL_SOC_PMIC_BXTWC && INTEL_PMC_IPC
---help--- ---help---
Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature. Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature.
This driver enables the alarm wakeup functionality in the TMU unit This driver enables the alarm wakeup functionality in the TMU unit

2
drivers/thermal/Kconfig
View File

@ -365,7 +365,7 @@ endmenu
config INTEL_BXT_PMIC_THERMAL config INTEL_BXT_PMIC_THERMAL
tristate "Intel Broxton PMIC thermal driver" tristate "Intel Broxton PMIC thermal driver"
depends on X86 && INTEL_SOC_PMIC && REGMAP depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP
help help
Select this driver for Intel Broxton PMIC with ADC channels monitoring Select this driver for Intel Broxton PMIC with ADC channels monitoring
system temperature measurements and alerts. system temperature measurements and alerts.