commit f3f93d230e9adcece81de989a7cfb4342ba602a4
author Holger Brunck <[holger.brunck@keymile.com]> Thu Jun 16 18:11:15 2011 +0530
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Mon Jul 04 10:55:28 2011 +0200
tree 8f8f14ebcbe3eb2f61ffedcac0449f0f9385f0b4
parent 1801881dccad6c12647472f0bcb867fbddaa94be

arm/kirkwood: if CONFIG_SOFT_I2C is set don't set CONFIG_I2C_MVTWSI

Some boards e.g. keymile arm boards have CONFIG_CMD_I2C switched on
but they use soft i2c on kirkwood. So don't switch CONFIG_I2C_MVTWSI
on in this case.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Heiko Schocher <hs@denx.de>

arch/arm/include/asm/arch-kirkwood/config.h

diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
index 71ba464..b7dae1e 100644
--- a/arch/arm/include/asm/arch-kirkwood/config.h
+++ b/arch/arm/include/asm/arch-kirkwood/config.h
@@ -137,7 +137,9 @@
  * I2C related stuff
  */
 #ifdef CONFIG_CMD_I2C
+#ifndef CONFIG_SOFT_I2C
 #define CONFIG_I2C_MVTWSI
+#endif
 #define CONFIG_SYS_I2C_SLAVE		0x0
 #define CONFIG_SYS_I2C_SPEED		100000
 #endif