Skip to contentSkip to conversation

mfd: intel_soc_pmic: Fix a mess with compilation units

PATCH Superseded Andy Shevchenko 2 participants 2 messages Feb 20, 2017 – Feb 23, 2017 Multifunction devices (MFD)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 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 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 <[email protected]>
---
 drivers/mfd/Kconfig  | 4 ++--
 drivers/mfd/Makefile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/mfd/Kconfig +2 -2
index 55ecdfb74d31..b121820be19c 100644
@@ -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.
drivers/mfd/Makefile +1 -1
index 31ce07611a6f..afc9401de46b 100644
@@ -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
Signature · 1 line
2.11.0
build bot
#1 lore raw
reproduce:

Hi Andy,

[auto build test ERROR on ljones-mfd/for-mfd-next]
[also build test ERROR on v4.10 next-20170223]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Andy-Shevchenko/mfd-intel_soc_pmic-Fix-a-mess-with-compilation-units/20170221-034440
base:   https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next
config: x86_64-randconfig-s1-02231720 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64

All errors (new ones prefixed by >>):

drivers/built-in.o: In function `bxtwc_remove':

>> intel_soc_pmic_bxtwc.c:(.text+0x1893c7): undefined reference to `regmap_del_irq_chip'
   intel_soc_pmic_bxtwc.c:(.text+0x1893d2): undefined reference to `regmap_del_irq_chip'
   intel_soc_pmic_bxtwc.c:(.text+0x1893dd): undefined reference to `regmap_del_irq_chip'
   drivers/built-in.o: In function `bxtwc_probe':
>> intel_soc_pmic_bxtwc.c:(.text+0x1896ec): undefined reference to `regmap_add_irq_chip'

intel_soc_pmic_bxtwc.c:(.text+0x189714): undefined reference to regmap_add_irq_chip' intel_soc_pmic_bxtwc.c:(.text+0x18973c): undefined reference to regmap_add_irq_chip' intel_soc_pmic_bxtwc.c:(.text+0x189761): undefined reference to regmap_del_irq_chip' intel_soc_pmic_bxtwc.c:(.text+0x18976c): undefined reference to regmap_del_irq_chip' intel_soc_pmic_bxtwc.c:(.text+0x189847): undefined reference to `regmap_del_irq_chip'

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation