[PATCH] i2c: designware-baytrail: Fix the Kconfig dependency fix

[PATCH] i2c: designware-baytrail: Fix the Kconfig dependency fix

[Jean Delvare]

Commit b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for
proper Kconfig dependencies") claims that the "Baytrail driver" isn't
tristate. But in fact there is no such thing as a "Baytrail driver",
i2c-designware-baytrail is not a stand-alone driver but an optional
addition to the i2c-designware-platform driver, and that driver *is*
tristate. So there is no reason why I2C_DESIGNWARE_BAYTRAIL couldn't
be enabled when IOSF_MBI=m, as long as I2C_DESIGNWARE_PLATFORM=m too.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Fixes: b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: David E. Box <david.e.box@linux.intel.com>
Cc: Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
 drivers/i2c/busses/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-4.5-rc2.orig/drivers/i2c/busses/Kconfig	2016-02-02 13:36:02.621152859 +0100
+++ linux-4.5-rc2/drivers/i2c/busses/Kconfig	2016-02-02 14:06:07.185912775 +0100
@@ -490,7 +490,7 @@ config I2C_DESIGNWARE_PCI
 
 config I2C_DESIGNWARE_BAYTRAIL
 	bool "Intel Baytrail I2C semaphore support"
-	depends on I2C_DESIGNWARE_PLATFORM && IOSF_MBI=y && ACPI
+	depends on I2C_DESIGNWARE_PLATFORM && (IOSF_MBI=y || IOSF_MBI=I2C_DESIGNWARE_PLATFORM) && ACPI
 	help
 	  This driver enables managed host access to the PMIC I2C bus on select
 	  Intel BayTrail platforms using the X-Powers AXP288 PMIC. It allows


-- 
Jean Delvare
SUSE L3 Support

Re: [PATCH] i2c: designware-baytrail: Fix the Kconfig dependency fix

[Jarkko Nikula]

On 02/02/2016 03:33 PM, Jean Delvare wrote:
> Commit b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for
> proper Kconfig dependencies") claims that the "Baytrail driver" isn't
> tristate. But in fact there is no such thing as a "Baytrail driver",
> i2c-designware-baytrail is not a stand-alone driver but an optional
> addition to the i2c-designware-platform driver, and that driver *is*
> tristate. So there is no reason why I2C_DESIGNWARE_BAYTRAIL couldn't
> be enabled when IOSF_MBI=m, as long as I2C_DESIGNWARE_PLATFORM=m too.
>
I had a similar patch waiting for David's ack because I didn't know are 
there any problems when IOSF_MBI is module but I forgot to ping again.

David: can you ack this in case IOSF_MBI=m is ok.

> Signed-off-by: Jean Delvare <jdelvare@suse.de>
> Fixes: b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Cc: David E. Box <david.e.box@linux.intel.com>
> Cc: Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> ---
>   drivers/i2c/busses/Kconfig |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-4.5-rc2.orig/drivers/i2c/busses/Kconfig	2016-02-02 13:36:02.621152859 +0100
> +++ linux-4.5-rc2/drivers/i2c/busses/Kconfig	2016-02-02 14:06:07.185912775 +0100
> @@ -490,7 +490,7 @@ config I2C_DESIGNWARE_PCI
>
>   config I2C_DESIGNWARE_BAYTRAIL
>   	bool "Intel Baytrail I2C semaphore support"
> -	depends on I2C_DESIGNWARE_PLATFORM && IOSF_MBI=y && ACPI
> +	depends on I2C_DESIGNWARE_PLATFORM && (IOSF_MBI=y || IOSF_MBI=I2C_DESIGNWARE_PLATFORM) && ACPI

One minor comment: could you split this into two depends on lines in 
order to avoid long lines?

Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>

Re: [PATCH] i2c: designware-baytrail: Fix the Kconfig dependency fix

[Jean Delvare]

On Thu, 4 Feb 2016 13:47:00 +0200, Jarkko Nikula wrote:
> On 02/02/2016 03:33 PM, Jean Delvare wrote:
> > Commit b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for
> > proper Kconfig dependencies") claims that the "Baytrail driver" isn't
> > tristate. But in fact there is no such thing as a "Baytrail driver",
> > i2c-designware-baytrail is not a stand-alone driver but an optional
> > addition to the i2c-designware-platform driver, and that driver *is*
> > tristate. So there is no reason why I2C_DESIGNWARE_BAYTRAIL couldn't
> > be enabled when IOSF_MBI=m, as long as I2C_DESIGNWARE_PLATFORM=m too.
> >
> I had a similar patch waiting for David's ack because I didn't know are 
> there any problems when IOSF_MBI is module but I forgot to ping again.
> 
> David: can you ack this in case IOSF_MBI=m is ok.
> 
> > Signed-off-by: Jean Delvare <jdelvare@suse.de>
> > Fixes: b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
> > Cc: Randy Dunlap <rdunlap@infradead.org>
> > Cc: David E. Box <david.e.box@linux.intel.com>
> > Cc: Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Wow, I messed up big time :( For clarity, this patch is not (yet)
signed-off by Wolfram, it's a copy-and-paste mistake on my side.

> > ---
> >   drivers/i2c/busses/Kconfig |    2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > --- linux-4.5-rc2.orig/drivers/i2c/busses/Kconfig	2016-02-02 13:36:02.621152859 +0100
> > +++ linux-4.5-rc2/drivers/i2c/busses/Kconfig	2016-02-02 14:06:07.185912775 +0100
> > @@ -490,7 +490,7 @@ config I2C_DESIGNWARE_PCI
> >
> >   config I2C_DESIGNWARE_BAYTRAIL
> >   	bool "Intel Baytrail I2C semaphore support"
> > -	depends on I2C_DESIGNWARE_PLATFORM && IOSF_MBI=y && ACPI
> > +	depends on I2C_DESIGNWARE_PLATFORM && (IOSF_MBI=y || IOSF_MBI=I2C_DESIGNWARE_PLATFORM) && ACPI
> 
> One minor comment: could you split this into two depends on lines in 
> order to avoid long lines?

Certainly. I'll resend the patch with this change after David approves
it.

> Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>

Thanks for the reviews!

-- 
Jean Delvare
SUSE L3 Support

Re: [PATCH] i2c: designware-baytrail: Fix the Kconfig dependency fix

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

> Wow, I messed up big time :( For clarity, this patch is not (yet)
> signed-off by Wolfram, it's a copy-and-paste mistake on my side.

Not a big deal for me; it was obviously a copy&paste error.

> Certainly. I'll resend the patch with this change after David approves
> it.

@David: ping


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]