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

[u-boot] / drivers / i2c / i2c-uclass-compat.c

diff --git a/drivers/i2c/i2c-uclass-compat.c b/drivers/i2c/i2c-uclass-compat.c
index c29fc89e048b4eed31255af68c12eb5121f81c8e..b3ade88113dbc35dbb32dd3babd3fc6aa01c4e3d 100644 (file)
--- a/drivers/i2c/i2c-uclass-compat.c
+++ b/drivers/i2c/i2c-uclass-compat.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -9,7 +8,7 @@
 #include <errno.h>
 #include <i2c.h>
 
-static int cur_busnum;
+static int cur_busnum __attribute__((section(".data")));
 
 static int i2c_compat_get_device(uint chip_addr, int alen,
                                 struct udevice **devp)
@@ -17,13 +16,13 @@ static int i2c_compat_get_device(uint chip_addr, int alen,
        struct dm_i2c_chip *chip;
        int ret;
 
-       ret = i2c_get_chip_for_busnum(cur_busnum, chip_addr, devp);
+       ret = i2c_get_chip_for_busnum(cur_busnum, chip_addr, alen, devp);
        if (ret)
                return ret;
-       chip = dev_get_parentdata(*devp);
+       chip = dev_get_parent_platdata(*devp);
        if (chip->offset_len != alen) {
-               printf("Requested alen %d does not match chip offset_len %d\n",
-                      alen, chip->offset_len);
+               printf("I2C chip %x: requested alen %d does not match chip offset_len %d\n",
+                      chip_addr, alen, chip->offset_len);
                return -EADDRNOTAVAIL;
        }
 
@@ -96,3 +95,34 @@ int i2c_set_bus_num(unsigned int bus)
 
        return 0;
 }
+
+void i2c_init(int speed, int slaveaddr)
+{
+       /* Nothing to do here - the init happens through driver model */
+}
+
+void board_i2c_init(const void *blob)
+{
+       /* Nothing to do here - the init happens through driver model */
+}
+
+uint8_t i2c_reg_read(uint8_t chip_addr, uint8_t offset)
+{
+       struct udevice *dev;
+       int ret;
+
+       ret = i2c_compat_get_device(chip_addr, 1, &dev);
+       if (ret)
+               return 0xff;
+       return dm_i2c_reg_read(dev, offset);
+}
+
+void i2c_reg_write(uint8_t chip_addr, uint8_t offset, uint8_t val)
+{
+       struct udevice *dev;
+       int ret;
+
+       ret = i2c_compat_get_device(chip_addr, 1, &dev);
+       if (!ret)
+               dm_i2c_reg_write(dev, offset, val);
+}