Skip to content

Commit

Permalink
eeprom: Add device model based I2C support to eeprom command
Browse files Browse the repository at this point in the history
After this change the 'eeprom' command can be used with DM aware boards.

Signed-off-by: Lukasz Majewski <[email protected]>
  • Loading branch information
Lukasz Majewski authored and trini committed Dec 3, 2018
1 parent 8ce7f2c commit 0c07a9b
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions cmd/eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}

Expand Down

0 comments on commit 0c07a9b

Please sign in to comment.