]> git.sur5r.net Git - u-boot/commitdiff
ARM: kirkwood: remove automatic I2C config if DM_I2C is enabled
authorChris Packham <judge.packham@gmail.com>
Wed, 30 May 2018 08:14:34 +0000 (20:14 +1200)
committerStefan Roese <sr@denx.de>
Tue, 5 Jun 2018 05:29:09 +0000 (07:29 +0200)
The mach/config.h file would helpfully define CONFIG_SYS_I2C and
CONFIG_SYS_I2C_MVTWSI if CONFIG_CMD_I2C was defined by the board. This
conflicts with the way DM_I2C works. As a transitional measure don't
automatically define these if CONFIG_DM_I2C is defined. It should be
possible to remove this once all kirkwood boards are migrated to DM.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
arch/arm/mach-kirkwood/include/mach/config.h

index d2dc1c2e68bcdb5192578da25cf399165f687437..f2b2de47d0571fbd1d3007c85751deb6a623c449 100644 (file)
 /*
  * I2C related stuff
  */
-#ifdef CONFIG_CMD_I2C
+#if defined(CONFIG_CMD_I2C) && !defined(CONFIG_DM_I2C)
 #ifndef CONFIG_SYS_I2C_SOFT
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MVTWSI