Re: [PATCH 2/5] mfd: intel_soc_pmic: Select designware i2c-bus driver

[Hans de Goede]

Hi,

On 23-03-17 17:46, Lee Jones wrote:
> On Wed, 22 Mar 2017, Andy Shevchenko wrote:
>
> > On Wed, 2017-03-22 at 12:29 +0100, Hans de Goede wrote:
> > > The Crystal Cove PMIC provides an ACPI OPRegion handler, which must be
> > > available before other drivers using it are loaded, which is why
> > > INTEL_SOC_PMIC is a bool.
> > >
> > > Just having the driver is not enough, the driver for the i2c-bus must
> > > also be built in, to ensure this, this patch adds a select for it.
> >
> > > While at it this patch also changes the human readable name of the
> > > Kconfig
> > > option to make clear the INTEL_SOC_PMIC option selects support for the
> > > Intel Crystal Cove PMIC and documents why this is a bool.
> >
> > The above is what my patch does, I'm okay if the change is going with
> > this series as long as Lee is on the same side. Otherwise I would prefer
> > to go my changes first.
>
> I think this set is going to need to be rebase on top of MFD.

This patch (2/5) and 3/5 should apply cleanly as they only
touch drivers/mfd/Kconfig and mfd-for-next has only 1 commit
touching Kconfig which is no where near the areas these 2
patches are making changes. So I believe they can be applied as is.

As for the other patches, patch 1/5 is for the ACPI subsys, since
you've requested changes to the Cherry Trail Whiskey Cove MFD driver
I will squash 4/5 into the new version of that and 5/5 again is an
ACPI patch.

Regards,

Hans



> > > Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> > > Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> > > ---
> > > Note this patch will partially conflicts with (contains the same
> > > changes as)
> > > a patch in Andy Shevchenko's tree.
> > > ---
> > >  drivers/mfd/Kconfig | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> > > index d427a10..0c6a967 100644
> > > --- a/drivers/mfd/Kconfig
> > > +++ b/drivers/mfd/Kconfig
> > > @@ -425,14 +425,17 @@ config LPC_SCH
> > >  	  System Management Bus and General Purpose I/O.
> > >
> > >  config INTEL_SOC_PMIC
> > > -	bool "Support for Intel Atom SoC PMIC"
> > > +	# This is a bool as it provides an ACPI Opregion which must
> > > be
> > > +	# available as soon as possible
> > > +	bool "Support for Intel Crystal Cove PMIC"
> > >  	depends on GPIOLIB
> > >  	depends on I2C=y
> > >  	select MFD_CORE
> > >  	select REGMAP_I2C
> > >  	select REGMAP_IRQ
> > > +	select I2C_DESIGNWARE_PLATFORM
> > >  	help
> > > -	  Select this option to enable support for the PMIC device
> > > +	  Select this option to enable support for the Crystal Cove
> > > PMIC
> > >  	  on some Intel SoC systems. The PMIC provides ADC, GPIO,
> > >  	  thermal, charger and related power management functions
> > >  	  on these systems.