diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-03 16:23:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-03 16:23:03 -0500 |
| commit | cf7c6f533331ff032d8949663ab2abe618da9cb4 (patch) | |
| tree | 05b83585e594685f83f626c21071172be1d607e5 /cmd/eeprom.c | |
| parent | 8f5bfb7615e82ffccebf79530b08034f81e56268 (diff) | |
| parent | fb0204e48b3e5ed5ecdfab89229140b6d4a1a08b (diff) | |
Merge branch '2018-12-03-master-imports'
- Baltos platform updates
- rtc m41t62 converted to DM.
- PowerPC MPC8xx DM conversion
- Verified boot updates
Diffstat (limited to 'cmd/eeprom.c')
| -rw-r--r-- | cmd/eeprom.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/cmd/eeprom.c b/cmd/eeprom.c index 4052cf494a..e88cb131a1 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -137,6 +137,23 @@ static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen, spi_write(addr, alen, buffer, len); #else /* I2C */ +#if defined(CONFIG_DM_I2C) && defined(CONFIG_SYS_I2C_EEPROM_BUS) + struct udevice *dev; + + ret = i2c_get_chip_for_busnum(CONFIG_SYS_I2C_EEPROM_BUS, addr[0], + alen - 1, &dev); + if (ret) { + printf("%s: Cannot find udev for a bus %d\n", __func__, + CONFIG_SYS_I2C_EEPROM_BUS); + return CMD_RET_FAILURE; + } + + if (read) + ret = dm_i2c_read(dev, offset, buffer, len); + else + ret = dm_i2c_write(dev, offset, buffer, len); + +#else /* Non DM I2C support - will be removed */ #if defined(CONFIG_SYS_I2C_EEPROM_BUS) i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS); #endif @@ -145,10 +162,11 @@ static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen, ret = i2c_read(addr[0], offset, alen - 1, buffer, len); else ret = i2c_write(addr[0], offset, alen - 1, buffer, len); - - if (ret) - ret = 1; #endif +#endif /* CONFIG_DM_I2C && CONFIG_SYS_I2C_EEPROM_BUS */ + if (ret) + ret = CMD_RET_FAILURE; + return ret; } |