summaryrefslogtreecommitdiff
path: root/common/cmd_eeprom.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-11-10 19:53:31 (GMT)
committerTom Rini <trini@konsulko.com>2015-11-22 02:50:26 (GMT)
commit354e3ed754fea744ff412b1e015b696db08320e3 (patch)
treeb46abf0507aac3f67b8940660fd60cb2612bb828 /common/cmd_eeprom.c
parent1a37889b0ad084a740b4f785031d7ae9955d947b (diff)
downloadu-boot-354e3ed754fea744ff412b1e015b696db08320e3.tar.xz
eeprom: Add bus argument to eeprom_init()
Add bus argument to eeprom_init(), so that it can select the I2C bus number on which the eeprom resides. Any negative value of the $bus argument will preserve the old behavior. This is in place so that old code does not randomly break. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Cc: Heiko Schocher <hs@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de> [trini: Wrap i2c_set_bus_num() call with CONFIG_SYS_I2C test] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/cmd_eeprom.c')
-rw-r--r--common/cmd_eeprom.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index d0942ef..120ddbb 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -60,7 +60,7 @@ __weak int eeprom_write_enable(unsigned dev_addr, int state)
return 0;
}
-void eeprom_init(void)
+void eeprom_init(int bus)
{
/* SPI EEPROM */
#if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
@@ -69,6 +69,10 @@ void eeprom_init(void)
/* I2C EEPROM */
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT)
+#if defined(CONFIG_SYS_I2C)
+ if (bus >= 0)
+ i2c_set_bus_num(bus);
+#endif
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
}
@@ -223,7 +227,7 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
off = simple_strtoul(*args++, NULL, 16);
cnt = simple_strtoul(*args++, NULL, 16);
- eeprom_init();
+ eeprom_init(-1);
if (strcmp (argv[1], "read") == 0) {
printf(fmt, dev_addr, argv[1], addr, off, cnt);