diff options
| author | Tom Rini <trini@ti.com> | 2014-09-17 18:01:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-17 18:01:04 -0400 |
| commit | e38b15b0619f9a8b869896229355808f494fb2ac (patch) | |
| tree | 2048b9e715f1d6f76b298bf404d4b2e293ae3b0c /board/compulab/common/eeprom.c | |
| parent | 1ee30aeed47724eb7c8f145f064b8d03cd294808 (diff) | |
| parent | c292adae170fa8c27dca75963bdb0a9afc640e57 (diff) | |
| download | talos-obmc-uboot-e38b15b0619f9a8b869896229355808f494fb2ac.tar.gz talos-obmc-uboot-e38b15b0619f9a8b869896229355808f494fb2ac.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/compulab/common/eeprom.c')
| -rw-r--r-- | board/compulab/common/eeprom.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index 20fe3e1960..85442cd103 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -31,8 +31,19 @@ static int cl_eeprom_layout; /* Implicitly LAYOUT_INVALID */ static int cl_eeprom_read(uint offset, uchar *buf, int len) { - return i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, offset, + int res; + unsigned int current_i2c_bus = i2c_get_bus_num(); + + res = i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS); + if (res < 0) + return res; + + res = i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, offset, CONFIG_SYS_I2C_EEPROM_ADDR_LEN, buf, len); + + i2c_set_bus_num(current_i2c_bus); + + return res; } static int cl_eeprom_setup_layout(void) |
