From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752852AbdCNPDM (ORCPT ); Tue, 14 Mar 2017 11:03:12 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37331 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752147AbdCNPCi (ORCPT ); Tue, 14 Mar 2017 11:02:38 -0400 Date: Tue, 14 Mar 2017 15:02:34 +0000 From: Lee Jones To: Andy Shevchenko Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] mfd: intel_soc_pmic: Fix a mess with compilation units Message-ID: <20170314150234.z4omelqdwox5tts4@dell> References: <20170313190727.8069-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170313190727.8069-1-andriy.shevchenko@linux.intel.com> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 13 Mar 2017, Andy Shevchenko wrote: > 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 are > 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 ever tested. The line in > Makefile is actually wrong. > > Signed-off-by: Andy Shevchenko > --- > drivers/mfd/Kconfig | 9 +++++++-- > drivers/mfd/Makefile | 2 +- > drivers/platform/x86/Kconfig | 1 + > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 55ecdfb74d31..83609acd55ef 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -425,18 +425,23 @@ 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 > + select MFD_CORE > + select REGMAP_IRQ I think you need to make mention that this is Whiskey Cove? > config MFD_INTEL_LPSS > tristate > select COMMON_CLK > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 31ce07611a6f..201aeaf5112a 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -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_SOC_PMIC_BXTWC) += intel_soc_pmic_bxtwc.o > obj-$(CONFIG_MFD_MT6397) += mt6397-core.o > > obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index e1bffc9bb194..afbff6d9834b 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -1011,6 +1011,7 @@ config PVPANIC > config INTEL_PMC_IPC > tristate "Intel PMC IPC Driver" > depends on ACPI > + select INTEL_SOC_PMIC_BXTWC > ---help--- > This driver provides support for PMC control on some Intel platforms. > The PMC is an ARC processor which defines IPC commands for communication -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog