mfd: intel_soc_pmic: Fix a mess with compilation units

PATCH Applied Andy Shevchenko 2 participants 4 messages Apr 4, 2017 – Apr 24, 2017

Subsystems (5)

ACPI GPIO Multifunction devices (MFD) x86 platform drivers +1 more subsystems

lore

Share & tools

lore

Andy Shevchenko

author

2017-04-04 12:38 UTC #0 lore raw

PATCH v4 1/1 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" <[email protected]> (supporter:ACPI)

Acked-by Linus Walleij <[email protected]>

Acked-by Zhang Rui <[email protected]>

Signed-off-by Andy Shevchenko <[email protected]>

---
- fix dependency for now, proper fix is to provide headers in platform_data/x86
- add tags

 drivers/acpi/Kconfig         |  2 +-
 drivers/gpio/Kconfig         |  2 +-
 drivers/mfd/Kconfig          | 15 +++++++++++++--
 drivers/mfd/Makefile         |  2 +-
 drivers/platform/x86/Kconfig |  2 +-
 drivers/thermal/Kconfig      |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

drivers/acpi/Kconfig +1 -1

index 3e15bf8f99f7..47d4e7be7a46 100644
@@ -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

index 63ceed246b6f..05e8fbfb3d85 100644
@@ -1053,7 +1053,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

index ce3a9180a765..a48176eb9b48 100644
@@ -446,18 +446,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

index fa86dbe65e52..c16bf1ea0ea9 100644
@@ -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

index 5602bdfcad65..4c0933174cd9 100644
@@ -1020,7 +1020,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

drivers/thermal/Kconfig +1 -1

index 93474015bb1d..8e47cfaa9aab 100644
@@ -353,7 +353,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.

Signature · 1 line

2.11.0

Lee Jones

Applied

2017-04-11 13:54 UTC #1 lore raw

Quoted 19 lines · Andy Shevchenko

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" <[email protected]> (supporter:ACPI)
Acked-by Linus Walleij <[email protected]>
Acked-by Zhang Rui <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>
---
- fix dependency for now, proper fix is to provide headers in platform_data/x86
- add tags

Quoted 7 lines

 drivers/acpi/Kconfig         |  2 +-
 drivers/gpio/Kconfig         |  2 +-
 drivers/mfd/Kconfig          | 15 +++++++++++++--
 drivers/mfd/Makefile         |  2 +-
 drivers/platform/x86/Kconfig |  2 +-
 drivers/thermal/Kconfig      |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

Applied, thanks.

Quoted 102 lines

drivers/acpi/Kconfig +1 -1

index 3e15bf8f99f7..47d4e7be7a46 100644
@@ -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

index 63ceed246b6f..05e8fbfb3d85 100644
@@ -1053,7 +1053,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

index ce3a9180a765..a48176eb9b48 100644
@@ -446,18 +446,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

index fa86dbe65e52..c16bf1ea0ea9 100644
@@ -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

index 5602bdfcad65..4c0933174cd9 100644
@@ -1020,7 +1020,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

drivers/thermal/Kconfig +1 -1

index 93474015bb1d..8e47cfaa9aab 100644
@@ -353,7 +353,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.

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Andy Shevchenko

author

2017-04-18 13:05 UTC #2 lore raw

Quoted 30 lines · Lee Jones

Quoted 26 lines · Andy Shevchenko
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" <[email protected]> (supporter:ACPI)
Acked-by Linus Walleij <[email protected]>
Acked-by Zhang Rui <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>
---
- fix dependency for now, proper fix is to provide headers in platform_data/x86
- add tags
drivers/acpi/Kconfig | 2 +- drivers/gpio/Kconfig | 2 +- drivers/mfd/Kconfig | 15 +++++++++++++-- drivers/mfd/Makefile | 2 +- drivers/platform/x86/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +-
Quoted 1 line
 6 files changed, 18 insertions(+), 7 deletions(-)

Quoted 1 line

Applied, thanks.

I didn't see it in next. Does it cause build issues still? I didn't get any report on it.

Signature · 2 lines

Andy Shevchenko <[email protected]>
Intel Finland Oy

Lee Jones

2017-04-24 10:48 UTC #3 lore raw

Quoted 31 lines · Andy Shevchenko

Quoted 30 lines · Lee Jones
Quoted 27 lines · Andy Shevchenko
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" <[email protected]> (supporter:ACPI)
Acked-by Linus Walleij <[email protected]>
Acked-by Zhang Rui <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>
---
- fix dependency for now, proper fix is to provide headers in platform_data/x86
- add tags
drivers/acpi/Kconfig | 2 +- drivers/gpio/Kconfig | 2 +- drivers/mfd/Kconfig | 15 +++++++++++++-- drivers/mfd/Makefile | 2 +- drivers/platform/x86/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

Quoted 4 lines

Quoted 1 line
Applied, thanks.
I didn't see it in next. Does it cause build issues still? I didn't get any report on it.

It's there now.

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog