Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / cmd / eeprom.c

diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 9136630..6c29b33 100644 (file)
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -124,6 +124,23 @@ static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen,
 {
        int ret = 0;
 
+#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
@@ -132,9 +149,9 @@ 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);
-
+#endif /* CONFIG_DM_I2C && CONFIG_SYS_I2C_EEPROM_BUS */
        if (ret)
-               ret = 1;
+               ret = CMD_RET_FAILURE;
 
        return ret;
 }