[PATCH 0/6] ChromeOS EC Kconfig cleanups

[PATCH 0/6] ChromeOS EC Kconfig cleanups

[Javier Martinez Canillas]

Hello,

This patch series attemp to fix the issues that exist with the ChromeOS
EC drivers Kconfig symbols. These are:

1) The MFD_CROS_EC config symbol select CROS_EC_PROTO and CHROME_PLATFORMS
   which caused a Kconfig unmet direct dependencies warning.

2) Mix of select and depends on for the CROS_EC_PROTO config symbol which
   may lead to circular Kconfig dependencies.

The first issue was because CHROME_PLATFORMS depend on X86 || ARM and the
MFD_CROS_EC didn't have this dependency. I thought the correct solution
was to remove the dependency for CHROME_PLATFORMS since in theory there
could be Chromebooks for other architectures.

That was made in commit d12bbcd3ea44 ("platform/chrome: Don't make
CHROME_PLATFORMS depends on X86 || ARM") but Geert nacked that and told me
the correct fix was the opposite, to add the dependencies to the driver
and possibly extend it with || COMPILE_TEST to have more build coverage.

So patch 1/5 do this and patch 2/5 reverts the mentioned commit and also
add || COMPILE_TEST to CHROME_PLATFORMS.

Patches 3/5 to 5/5 fix 2) by not making the drivers depend on CROS_EC_PROTO
since these should really depend on MFD_CROS_EC. And since MFD_CROSEC select
CROS_EC_PROTO already, that dependency is met as well.

Only patches 1/5 and 2/5 have to be applied in the same order and picked
through a single tree to avoid the Kconfig warning to appear again. The
other patches are independent and can go through the other subsystem trees.

Thanks a lot to Geert and Bartolomiej for the feedback and suggestions.

Best regards,
Javier


Javier Martinez Canillas (6):
  mfd: Add MFD_CROS_EC dependencies
  Revert "platform/chrome: Don't make CHROME_PLATFORMS depends on X86 ||
    ARM"
  platform/chrome: Make depends on MFD_CROS_EC instead CROS_EC_PROTO
  mfd: cros_ec: Remove CROS_EC_PROTO dependency for SPI and I2C drivers
  i2c: Replace I2C_CROS_EC_TUNNEL dependency
  Input: Replace KEYBOARD_CROS_EC dependency

 drivers/i2c/busses/Kconfig      | 2 +-
 drivers/input/keyboard/Kconfig  | 2 +-
 drivers/mfd/Kconfig             | 5 +++--
 drivers/platform/chrome/Kconfig | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

-- 
2.4.3

[PATCH 5/6] i2c: Replace I2C_CROS_EC_TUNNEL dependency

[Javier Martinez Canillas]

The ChromeOS EC tunnel I2C bus driver depend on CROS_EC_PROTO but
MFD_CROS_EC select CROS_EC_PROTO instead. Mixing select and depends
on is bad practice as it may lead to circular Kconfig dependencies.

Since the platform device that is matched with the I2C bus driver
is registered by the ChromeOS EC mfd driver, I2C_CROS_EC_TUNNEL
really depends on MFD_CROS_EC. And because this config option
selects CROS_EC_PROTO, that dependency is met as well. So make the
driver to depend on MFD_CROS_EC instead of CROS_EC_PROTO.

Signed-off-by: Javier Martinez Canillas <javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>

---

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 0b798ae708fe..f25b508bbd71 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -1130,7 +1130,7 @@ config I2C_SIBYTE
 
 config I2C_CROS_EC_TUNNEL
 	tristate "ChromeOS EC tunnel I2C bus"
-	depends on CROS_EC_PROTO
+	depends on MFD_CROS_EC
 	help
 	  If you say yes here you get an I2C bus that will tunnel i2c commands
 	  through to the other side of the ChromeOS EC to the i2c bus
-- 
2.4.3

Re: [PATCH 5/6] i2c: Replace I2C_CROS_EC_TUNNEL dependency

[Wolfram Sang]

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

On Wed, Aug 19, 2015 at 01:19:57PM +0200, Javier Martinez Canillas wrote:
> The ChromeOS EC tunnel I2C bus driver depend on CROS_EC_PROTO but
> MFD_CROS_EC select CROS_EC_PROTO instead. Mixing select and depends
> on is bad practice as it may lead to circular Kconfig dependencies.
> 
> Since the platform device that is matched with the I2C bus driver
> is registered by the ChromeOS EC mfd driver, I2C_CROS_EC_TUNNEL
> really depends on MFD_CROS_EC. And because this config option
> selects CROS_EC_PROTO, that dependency is met as well. So make the
> driver to depend on MFD_CROS_EC instead of CROS_EC_PROTO.
> 
> Signed-off-by: Javier Martinez Canillas <javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
> 

Applied to for-next, thanks!


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