]> git.baikalelectronics.ru Git - uboot.git/commit
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)
commit4fdaa08c36622e6c1904de36ad1047385f4a5670
treeecb13c29cd2ca44f293856c47ce13aaf5dc578db
parent2f322a1ca66ad6f264566133556d21de2c7770eb
ARM: kirkwood: remove automatic I2C config if DM_I2C is enabled

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