Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imx

[oweals/u-boot.git] / drivers / misc / i2c_eeprom.c

diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index c9f4174bad42f928e707e7a2570e24a827bca536..f25d0540075d55db29ba8eb256034146fbcd24a7 100644 (file)
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -1,36 +1,79 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/err.h>
+#include <linux/kernel.h>
 #include <dm.h>
 #include <i2c.h>
 #include <i2c_eeprom.h>
 
-static int i2c_eeprom_read(struct udevice *dev, int offset, uint8_t *buf,
-                          int size)
+int i2c_eeprom_read(struct udevice *dev, int offset, uint8_t *buf, int size)
+{
+       const struct i2c_eeprom_ops *ops = device_get_ops(dev);
+
+       if (!ops->read)
+               return -ENOSYS;
+
+       return ops->read(dev, offset, buf, size);
+}
+
+int i2c_eeprom_write(struct udevice *dev, int offset, uint8_t *buf, int size)
+{
+       const struct i2c_eeprom_ops *ops = device_get_ops(dev);
+
+       if (!ops->write)
+               return -ENOSYS;
+
+       return ops->write(dev, offset, buf, size);
+}
+
+static int i2c_eeprom_std_read(struct udevice *dev, int offset, uint8_t *buf,
+                              int size)
 {
        return dm_i2c_read(dev, offset, buf, size);
 }
 
-static int i2c_eeprom_write(struct udevice *dev, int offset,
-                           const uint8_t *buf, int size)
+static int i2c_eeprom_std_write(struct udevice *dev, int offset,
+                               const uint8_t *buf, int size)
 {
-       return -ENODEV;
+       struct i2c_eeprom *priv = dev_get_priv(dev);
+       int ret;
+
+       while (size > 0) {
+               int write_size = min_t(int, size, priv->pagesize);
+
+               ret = dm_i2c_write(dev, offset, buf, write_size);
+               if (ret)
+                       return ret;
+
+               offset += write_size;
+               buf += write_size;
+               size -= write_size;
+
+               udelay(10000);
+       }
+
+       return 0;
 }
 
-struct i2c_eeprom_ops i2c_eeprom_std_ops = {
-       .read   = i2c_eeprom_read,
-       .write  = i2c_eeprom_write,
+static const struct i2c_eeprom_ops i2c_eeprom_std_ops = {
+       .read   = i2c_eeprom_std_read,
+       .write  = i2c_eeprom_std_write,
 };
 
 static int i2c_eeprom_std_ofdata_to_platdata(struct udevice *dev)
 {
        struct i2c_eeprom *priv = dev_get_priv(dev);
        u64 data = dev_get_driver_data(dev);
+       u32 pagesize;
+
+       if (dev_read_u32(dev, "pagesize", &pagesize) == 0) {
+               priv->pagesize = pagesize;
+               return 0;
+       }
 
        /* 6 bit -> page size of up to 2^63 (should be sufficient) */
        priv->pagewidth = data & 0x3F;
@@ -39,18 +82,21 @@ static int i2c_eeprom_std_ofdata_to_platdata(struct udevice *dev)
        return 0;
 }
 
-int i2c_eeprom_std_probe(struct udevice *dev)
+static int i2c_eeprom_std_probe(struct udevice *dev)
 {
        return 0;
 }
 
 static const struct udevice_id i2c_eeprom_std_ids[] = {
        { .compatible = "i2c-eeprom", .data = 0 },
+       { .compatible = "microchip,24aa02e48", .data = 3 },
        { .compatible = "atmel,24c01a", .data = 3 },
        { .compatible = "atmel,24c02", .data = 3 },
        { .compatible = "atmel,24c04", .data = 4 },
+       { .compatible = "atmel,24c08", .data = 4 },
        { .compatible = "atmel,24c08a", .data = 4 },
        { .compatible = "atmel,24c16a", .data = 4 },
+       { .compatible = "atmel,24mac402", .data = 4 },
        { .compatible = "atmel,24c32", .data = 5 },
        { .compatible = "atmel,24c64", .data = 5 },
        { .compatible = "atmel,24c128", .data = 6 },