Skip to contentSkip to conversation

i2c: designware-baytrail: Fix the Kconfig dependency fix

PATCH Superseded Jean Delvare 3 participants 4 messages Feb 2, 2016 – Feb 12, 2016 I2C subsystem host drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i2c: designware-baytrail: Fix the Kconfig dependency fix

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.

Fixes b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
Cc Randy Dunlap <[email protected]>
Cc David E. Box <[email protected]>
Cc Signed-off-by: Wolfram Sang <[email protected]>
---
 drivers/i2c/busses/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/Kconfig +1 -1
@@ -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
Signature · 2 lines
Jean Delvare
SUSE L3 Support
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · 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.

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.

Quoted 12 lines
Fixes b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
Cc Randy Dunlap <[email protected]>
Cc David E. Box <[email protected]>
Cc Signed-off-by: Wolfram Sang <[email protected]>
---
  drivers/i2c/busses/Kconfig |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

drivers/i2c/busses/Kconfig config I2C_DESIGNWARE_PCI · line 493

Quoted 5 lines
drivers/i2c/busses/Kconfig +1 -1
@@ -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?

#2 lore raw
Quoted 9 lines · Jarkko Nikula
Quoted 8 lines · 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.

Quoted 10 lines

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.

Quoted 5 lines
Fixes b4ad0510f5d9 ("i2c: designware-baytrail: another fixup for proper Kconfig dependencies")
Cc Randy Dunlap <[email protected]>
Cc David E. Box <[email protected]>
Cc Signed-off-by: Wolfram Sang <[email protected]>

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.

Quoted 8 lines
Quoted 8 lines
---
  drivers/i2c/busses/Kconfig |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/Kconfig +0 -0
@@ -490,7 +490,7 @@ config I2C_DESIGNWARE_PCI
 
Quoted 7 lines

drivers/i2c/busses/Kconfig config I2C_DESIGNWARE_PCI · line 493

Quoted 4 lines
drivers/i2c/busses/Kconfig +1 -1
  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.

Quoted 1 line

Thanks for the reviews!

Signature · 2 lines
Jean Delvare
SUSE L3 Support
#3 lore raw
Quoted 2 lines

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.

Quoted 2 lines

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

@David: ping