summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-kirkwood
diff options
context:
space:
mode:
authorHolger Brunck <[holger.brunck@keymile.com]>2011-06-16 18:11:15 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-07-04 10:55:28 +0200
commitb31a82e95f59fa938911a218aae2a7eb1ae932a7 (patch)
tree8f8f14ebcbe3eb2f61ffedcac0449f0f9385f0b4 /arch/arm/include/asm/arch-kirkwood
parent24e50461c07953d43bf8b3500f3f8433cf10929a (diff)
downloadu-boot-imx-b31a82e95f59fa938911a218aae2a7eb1ae932a7.zip
u-boot-imx-b31a82e95f59fa938911a218aae2a7eb1ae932a7.tar.gz
u-boot-imx-b31a82e95f59fa938911a218aae2a7eb1ae932a7.tar.bz2
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>
Diffstat (limited to 'arch/arm/include/asm/arch-kirkwood')
-rw-r--r--arch/arm/include/asm/arch-kirkwood/config.h2
1 files changed, 2 insertions, 0 deletions
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