| Message ID | 20170615130732.6769-2-hdegoede@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] mfd: intel_soc_pmic: use 'depends on' instead of 'select' | expand |
On Thu, 15 Jun 2017, Hans de Goede wrote: > From: Arnd Bergmann <arnd@arndb.de> > > I ran into a build error on ARM with a platform that has a non-standard > clk implementation: > > drivers/clk/clk.o: In function `clk_disable': > clk.c:(.text.clk_disable+0x0): multiple definition of `clk_disable' > arch/arm/mach-omap1/clock.o:clock.c:(.text.clk_disable+0x0): first defined here > drivers/clk/clk.o: In function `clk_enable': > clk.c:(.text.clk_enable+0x0): multiple definition of `clk_enable' > arch/arm/mach-omap1/clock.o:clock.c:(.text.clk_enable+0x0): first defined here > > The problem is a device driver that uses 'select COMMON_CLK', which is > generally a bad idea: selecting a subsystem should only be done from > a platform, otherwise we run into circular dependencies. The same driver > also selects 'GPIOLIB' and 'I2C', which has a similar effect. > > This turns all three into 'depends on', as it should be. > > Finally, we can limit the build to x86, unless we are compile testing. > > Fixes: 2f91ded5f8f4 ("mfd: Add Cherry Trail Whiskey Cove PMIC driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > -Split into 2 seperate patches for config INTEL_SOC_PMIC and > config INTEL_SOC_PMIC_CHTWC > --- > drivers/mfd/Kconfig | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 2499f8b5135a..1428814c33f9 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -481,13 +481,12 @@ config INTEL_SOC_PMIC_BXTWC > on these systems. > > config INTEL_SOC_PMIC_CHTWC > - bool "Support for Intel Cherry Trail Whiskey Cove PMIC" > - depends on ACPI && HAS_IOMEM > + tristate "Support for Intel Cherry Trail Whiskey Cove PMIC" > + depends on ACPI && HAS_IOMEM && I2C=y && COMMON_CLK > + depends on X86 || COMPILE_TEST > select MFD_CORE > - select I2C > select REGMAP_I2C > select REGMAP_IRQ > - select COMMON_CLK > select I2C_DESIGNWARE_PLATFORM > help > Select this option to enable support for the Intel Cherry Trail -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 2499f8b5135a..1428814c33f9 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -481,13 +481,12 @@ config INTEL_SOC_PMIC_BXTWC on these systems. config INTEL_SOC_PMIC_CHTWC - bool "Support for Intel Cherry Trail Whiskey Cove PMIC" - depends on ACPI && HAS_IOMEM + tristate "Support for Intel Cherry Trail Whiskey Cove PMIC" + depends on ACPI && HAS_IOMEM && I2C=y && COMMON_CLK + depends on X86 || COMPILE_TEST select MFD_CORE - select I2C select REGMAP_I2C select REGMAP_IRQ - select COMMON_CLK select I2C_DESIGNWARE_PLATFORM help Select this option to enable support for the Intel Cherry Trail