[U-Boot] [PATCH] common, env: Fix support for environment in i2c eeprom

[U-Boot] [PATCH] common, env: Fix support for environment in i2c eeprom

[Matthias Fuchs]

When using CONFIG_SYS_I2C i2c needs to be initialized by
i2c_init_all(). This is done in some places but not in
eeprom_init().

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
---
 common/cmd_eeprom.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 3924805..fad462f 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -389,8 +389,13 @@ void eeprom_init  (void)
 #if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
 	spi_init_f ();
 #endif
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT)
-	i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) || \
+	defined(CONFIG_SYS_I2C)
+#ifdef CONFIG_SYS_I2C
+	i2c_init_all();
+#else
+	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#endif
 #endif
 }
 
-- 
1.7.9.5

[U-Boot] common, env: Fix support for environment in i2c eeprom

[Tom Rini]

On Wed, Mar 19, 2014 at 10:25:08AM +0100, Matthias Fuchs wrote:

> When using CONFIG_SYS_I2C i2c needs to be initialized by
> i2c_init_all(). This is done in some places but not in
> eeprom_init().
> 
> Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140328/e63d500b/attachment.pgp>