rockchip: i2c: rk3328: support i2c for rk3328 SoC

[u-boot] / drivers / i2c / i2c-cdns.c

diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index 89d429b91e5efefc7ba5148b9c4478b7ea70e0d0..8265ce32106bfdd0093857e0fe0066d9f92fb0c5 100644 (file)
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -9,10 +9,10 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <linux/types.h>
 #include <linux/io.h>
 #include <linux/errno.h>
-#include <dm/device.h>
 #include <dm/root.h>
 #include <i2c.h>
 #include <fdtdec.h>
@@ -226,26 +226,6 @@ static int cdns_i2c_set_bus_speed(struct udevice *dev, unsigned int speed)
        return 0;
 }
 
-/* Probe to see if a chip is present. */
-static int cdns_i2c_probe_chip(struct udevice *bus, uint chip_addr,
-                               uint chip_flags)
-{
-       struct i2c_cdns_bus *i2c_bus = dev_get_priv(bus);
-       struct cdns_i2c_regs *regs = i2c_bus->regs;
-
-       /* Attempt to read a byte */
-       setbits_le32(&regs->control, CDNS_I2C_CONTROL_CLR_FIFO |
-               CDNS_I2C_CONTROL_RW);
-       clrbits_le32(&regs->control, CDNS_I2C_CONTROL_HOLD);
-       writel(0xFF, &regs->interrupt_status);
-       writel(chip_addr, &regs->address);
-       writel(1, &regs->transfer_size);
-
-       return (cdns_i2c_wait(regs, CDNS_I2C_INTERRUPT_COMP |
-               CDNS_I2C_INTERRUPT_NACK) &
-               CDNS_I2C_INTERRUPT_COMP) ? 0 : -ETIMEDOUT;
-}
-
 static int cdns_i2c_write_data(struct i2c_cdns_bus *i2c_bus, u32 addr, u8 *data,
                               u32 len)
 {
@@ -439,7 +419,7 @@ static int cdns_i2c_ofdata_to_platdata(struct udevice *dev)
        struct cdns_i2c_platform_data *pdata =
                (struct cdns_i2c_platform_data *)dev_get_driver_data(dev);
 
-       i2c_bus->regs = (struct cdns_i2c_regs *)dev_get_addr(dev);
+       i2c_bus->regs = (struct cdns_i2c_regs *)devfdt_get_addr(dev);
        if (!i2c_bus->regs)
                return -ENOMEM;
 
@@ -453,7 +433,6 @@ static int cdns_i2c_ofdata_to_platdata(struct udevice *dev)
 
 static const struct dm_i2c_ops cdns_i2c_ops = {
        .xfer = cdns_i2c_xfer,
-       .probe_chip = cdns_i2c_probe_chip,
        .set_bus_speed = cdns_i2c_set_bus_speed,
 };