| Message ID | 1308125512-20834-1-git-send-email-holger.brunck@keymile.com |
|---|---|
| State | Accepted |
| Headers | show |
> -----Original Message----- > From: Holger Brunck [mailto:holger.brunck@keymile.com] > Sent: Wednesday, June 15, 2011 1:42 PM > To: u-boot@lists.denx.de > Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko Schocher > Subject: [PATCH v2 1/2] 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> > --- > changes for v2: > - nothing > > arch/arm/include/asm/arch-kirkwood/config.h | 2 ++ > 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 Applied to u-boot-marvell.git next brach Regards.. Prafulla . . > -- > 1.7.1
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
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> --- changes for v2: - nothing arch/arm/include/asm/arch-kirkwood/config.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)