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

[PATCH v2] 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")
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: David E. Box <david.e.box@linux.intel.com>
Cc: Wolfram Sang <wsa@the-dreams.de>
---
Changes since v1:
* Fixed Wolfram's Cc.
* Split the dependency line to avoid too long a line (suggested by
  Jarkko.)
* Added more Ccs.

 drivers/i2c/busses/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- linux-4.5-rc2.orig/drivers/i2c/busses/Kconfig	2016-02-02 14:32:22.762878539 +0100
+++ linux-4.5-rc2/drivers/i2c/busses/Kconfig	2016-02-04 21:01:49.075379053 +0100
@@ -490,7 +490,8 @@ 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 && ACPI
+	depends on IOSF_MBI=y || IOSF_MBI=I2C_DESIGNWARE_PLATFORM
 	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 v2] i2c: designware-baytrail: Fix the Kconfig dependency fix

[Wolfram Sang]

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

On Fri, Jul 22, 2016 at 10:24:03AM +0200, 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.
> 
> Signed-off-by: Jean Delvare <jdelvare@suse.de>
> Fixes: b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
> Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Cc: David E. Box <david.e.box@linux.intel.com>
> Cc: Wolfram Sang <wsa@the-dreams.de>

I applied a patch from Jarkko on 19.6.2016 which also changed the
dependencies. Not sure if it is equal to your change, but this patch
doesn't apply anymore.


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

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

[Jean Delvare]

Hi Wolfram, Jarkko,

On Thu, 25 Aug 2016 22:24:25 +0200, Wolfram Sang wrote:
> On Fri, Jul 22, 2016 at 10:24:03AM +0200, 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.
> > 
> > Signed-off-by: Jean Delvare <jdelvare@suse.de>
> > Fixes: b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
> > Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> > Cc: Randy Dunlap <rdunlap@infradead.org>
> > Cc: David E. Box <david.e.box@linux.intel.com>
> > Cc: Wolfram Sang <wsa@the-dreams.de>
> 
> I applied a patch from Jarkko on 19.6.2016 which also changed the
> dependencies. Not sure if it is equal to your change, but this patch
> doesn't apply anymore.

As I understand it, Jarkko's patch sets the same dependencies my patch
was setting, just expressed differently. So we are good, you can drop
my patch.

Thanks,
-- 
Jean Delvare
SUSE L3 Support

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

[Wolfram Sang]

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


> > I applied a patch from Jarkko on 19.6.2016 which also changed the
> > dependencies. Not sure if it is equal to your change, but this patch
> > doesn't apply anymore.
> 
> As I understand it, Jarkko's patch sets the same dependencies my patch
> was setting, just expressed differently. So we are good, you can drop
> my patch.

Will do, thanks for the heads up!


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