]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Revert "common, env: Fix support for environment in i2c eeprom"
authorValentin Longchamp <valentin.longchamp@keymile.com>
Tue, 14 Oct 2014 09:16:33 +0000 (11:16 +0200)
committerTom Rini <trini@ti.com>
Mon, 27 Oct 2014 15:04:00 +0000 (11:04 -0400)
Since i2c_init_all always sets the bus back to CONFIG_SYS_SPD_BUS_NUM
for compatibility reasons, it means that any eeprom not located on this
CONFIG_SYS_SPD_BUS_NUM is not accessible with the eeprom commands, even
if you change the bus number with an i2c dev command before.

Furthermore i2c_init_all should disappear and is currently only called
from the early board initialisation sequences, it is not suited for
other usage.

This reverts commit 01a0c64762e902971b34587a8a61b59e9ea51374.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
common/cmd_eeprom.c

index a02f0cb0bbc46cd5f781154f2d1652822f483422..29f0f1f78418ddaea20c13070f32ab274c788970 100644 (file)
@@ -389,13 +389,8 @@ 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) || \
-       defined(CONFIG_SYS_I2C)
-#ifdef CONFIG_SYS_I2C
-       i2c_init_all();
-#else
-       i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
+#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT)
+       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 #endif
 }