diff options
| author | Marek Vasut <marex@denx.de> | 2015-11-10 20:53:31 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-21 21:50:26 -0500 |
| commit | 354e3ed754fea744ff412b1e015b696db08320e3 (patch) | |
| tree | b46abf0507aac3f67b8940660fd60cb2612bb828 | |
| parent | 1a37889b0ad084a740b4f785031d7ae9955d947b (diff) | |
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>
| -rw-r--r-- | common/cmd_eeprom.c | 8 | ||||
| -rw-r--r-- | common/env_eeprom.c | 4 | ||||
| -rw-r--r-- | include/common.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index d0942ef65d..120ddbbf97 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); diff --git a/common/env_eeprom.c b/common/env_eeprom.c index eea169d484..72b13734f2 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -91,7 +91,7 @@ void env_relocate_spec(void) uchar rdbuf[64], flags[2]; int i, crc_ok[2] = {0, 0}; - eeprom_init(); /* prepare for EEPROM read/write */ + eeprom_init(-1); /* prepare for EEPROM read/write */ off_env[0] = CONFIG_ENV_OFFSET; off_env[1] = CONFIG_ENV_OFFSET_REDUND; @@ -154,7 +154,7 @@ void env_relocate_spec(void) ulong crc, len, new; uchar rdbuf[64]; - eeprom_init(); /* prepare for EEPROM read/write */ + eeprom_init(-1); /* prepare for EEPROM read/write */ /* read old CRC */ eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR, diff --git a/include/common.h b/include/common.h index cb35ac8aaa..a3831b78dc 100644 --- a/include/common.h +++ b/include/common.h @@ -474,7 +474,7 @@ void reset_phy (void); void fdc_hw_init (void); /* $(BOARD)/eeprom.c */ -void eeprom_init (void); +void eeprom_init (int bus); int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt); int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt); |