Merge git://git.denx.de/u-boot-dm
[oweals/u-boot.git] / drivers / i2c / davinci_i2c.c
index 5e3406dc8f4f04c8a87f1fd9e80aa280a4f658fd..4471193402e5261959066eaa01998117d50b0e5d 100644 (file)
 /*
  * TI DaVinci (TMS320DM644x) I2C driver.
  *
- * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- *
+ * (C) Copyright 2012-2014
+ *     Texas Instruments Incorporated, <www.ti.com>
+ * (C) Copyright 2007 Sergey Kubushyn <ksi@koi8.net>
  * --------------------------------------------------------
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier:    GPL-2.0+
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * NOTE: This driver should be converted to driver model before June 2017.
+ * Please see doc/driver-model/i2c-howto.txt for instructions.
  */
 
 #include <common.h>
 #include <i2c.h>
+#include <dm.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/i2c_defs.h>
+#include <asm/io.h>
+#include "davinci_i2c.h"
+
+#ifdef CONFIG_DM_I2C
+/* Information about i2c controller */
+struct i2c_bus {
+       int                     id;
+       uint                    speed;
+       struct i2c_regs         *regs;
+};
+#endif
 
 #define CHECK_NACK() \
        do {\
                if (tmp & (I2C_TIMEOUT | I2C_STAT_NACK)) {\
-                       REG(I2C_CON) = 0;\
-                       return(1);\
-               }\
+                       REG(&(i2c_base->i2c_con)) = 0;\
+                       return 1;\
+               } \
        } while (0)
 
-
-static int wait_for_bus(void)
+static int _wait_for_bus(struct i2c_regs *i2c_base)
 {
        int     stat, timeout;
 
-       REG(I2C_STAT) = 0xffff;
+       REG(&(i2c_base->i2c_stat)) = 0xffff;
 
        for (timeout = 0; timeout < 10; timeout++) {
-               if (!((stat = REG(I2C_STAT)) & I2C_STAT_BB)) {
-                       REG(I2C_STAT) = 0xffff;
-                       return(0);
+               stat = REG(&(i2c_base->i2c_stat));
+               if (!((stat) & I2C_STAT_BB)) {
+                       REG(&(i2c_base->i2c_stat)) = 0xffff;
+                       return 0;
                }
 
-               REG(I2C_STAT) = stat;
+               REG(&(i2c_base->i2c_stat)) = stat;
                udelay(50000);
        }
 
-       REG(I2C_STAT) = 0xffff;
-       return(1);
+       REG(&(i2c_base->i2c_stat)) = 0xffff;
+       return 1;
 }
 
-
-static int poll_i2c_irq(int mask)
+static int _poll_i2c_irq(struct i2c_regs *i2c_base, int mask)
 {
        int     stat, timeout;
 
        for (timeout = 0; timeout < 10; timeout++) {
                udelay(1000);
-               stat = REG(I2C_STAT);
-               if (stat & mask) {
-                       return(stat);
-               }
+               stat = REG(&(i2c_base->i2c_stat));
+               if (stat & mask)
+                       return stat;
        }
 
-       REG(I2C_STAT) = 0xffff;
-       return(stat | I2C_TIMEOUT);
+       REG(&(i2c_base->i2c_stat)) = 0xffff;
+       return stat | I2C_TIMEOUT;
 }
 
-
-void flush_rx(void)
+static void _flush_rx(struct i2c_regs *i2c_base)
 {
-       int     dummy;
-
        while (1) {
-               if (!(REG(I2C_STAT) & I2C_STAT_RRDY))
+               if (!(REG(&(i2c_base->i2c_stat)) & I2C_STAT_RRDY))
                        break;
 
-               dummy = REG(I2C_DRR);
-               REG(I2C_STAT) = I2C_STAT_RRDY;
+               REG(&(i2c_base->i2c_drr));
+               REG(&(i2c_base->i2c_stat)) = I2C_STAT_RRDY;
                udelay(1000);
        }
 }
 
-
-void i2c_init(int speed, int slaveadd)
+static uint _davinci_i2c_setspeed(struct i2c_regs *i2c_base,
+                                 uint speed)
 {
-       u_int32_t       div, psc;
-
-       if (REG(I2C_CON) & I2C_CON_EN) {
-               REG(I2C_CON) = 0;
-               udelay (50000);
-       }
+       uint32_t        div, psc;
 
        psc = 2;
-       div = (CONFIG_SYS_HZ_CLOCK / ((psc + 1) * speed)) - 10; /* SCLL + SCLH */
-       REG(I2C_PSC) = psc;                     /* 27MHz / (2 + 1) = 9MHz */
-       REG(I2C_SCLL) = (div * 50) / 100;       /* 50% Duty */
-       REG(I2C_SCLH) = div - REG(I2C_SCLL);
-
-       REG(I2C_OA) = slaveadd;
-       REG(I2C_CNT) = 0;
-
-       /* Interrupts must be enabled or I2C module won't work */
-       REG(I2C_IE) = I2C_IE_SCD_IE | I2C_IE_XRDY_IE |
-               I2C_IE_RRDY_IE | I2C_IE_ARDY_IE | I2C_IE_NACK_IE;
+       /* SCLL + SCLH */
+       div = (CONFIG_SYS_HZ_CLOCK / ((psc + 1) * speed)) - 10;
+       REG(&(i2c_base->i2c_psc)) = psc; /* 27MHz / (2 + 1) = 9MHz */
+       REG(&(i2c_base->i2c_scll)) = (div * 50) / 100; /* 50% Duty */
+       REG(&(i2c_base->i2c_sclh)) = div - REG(&(i2c_base->i2c_scll));
 
-       /* Now enable I2C controller (get it out of reset) */
-       REG(I2C_CON) = I2C_CON_EN;
-
-       udelay(1000);
-}
-
-int i2c_set_bus_speed(unsigned int speed)
-{
-       i2c_init(speed, CONFIG_SYS_I2C_SLAVE);
        return 0;
 }
 
-int i2c_probe(u_int8_t chip)
+static void _davinci_i2c_init(struct i2c_regs *i2c_base,
+                             uint speed, int slaveadd)
 {
-       int     rc = 1;
-
-       if (chip == REG(I2C_OA)) {
-               return(rc);
+       if (REG(&(i2c_base->i2c_con)) & I2C_CON_EN) {
+               REG(&(i2c_base->i2c_con)) = 0;
+               udelay(50000);
        }
 
-       REG(I2C_CON) = 0;
-       if (wait_for_bus()) {return(1);}
+       _davinci_i2c_setspeed(i2c_base, speed);
 
-       /* try to read one byte from current (or only) address */
-       REG(I2C_CNT) = 1;
-       REG(I2C_SA) = chip;
-       REG(I2C_CON) = (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_STP);
-       udelay (50000);
+       REG(&(i2c_base->i2c_oa)) = slaveadd;
+       REG(&(i2c_base->i2c_cnt)) = 0;
 
-       if (!(REG(I2C_STAT) & I2C_STAT_NACK)) {
-               rc = 0;
-               flush_rx();
-               REG(I2C_STAT) = 0xffff;
-       } else {
-               REG(I2C_STAT) = 0xffff;
-               REG(I2C_CON) |= I2C_CON_STP;
-               udelay(20000);
-               if (wait_for_bus()) {return(1);}
-       }
+       /* Interrupts must be enabled or I2C module won't work */
+       REG(&(i2c_base->i2c_ie)) = I2C_IE_SCD_IE | I2C_IE_XRDY_IE |
+               I2C_IE_RRDY_IE | I2C_IE_ARDY_IE | I2C_IE_NACK_IE;
 
-       flush_rx();
-       REG(I2C_STAT) = 0xffff;
-       REG(I2C_CNT) = 0;
-       return(rc);
-}
+       /* Now enable I2C controller (get it out of reset) */
+       REG(&(i2c_base->i2c_con)) = I2C_CON_EN;
 
+       udelay(1000);
+}
 
-int i2c_read(u_int8_t chip, u_int32_t addr, int alen, u_int8_t *buf, int len)
+static int _davinci_i2c_read(struct i2c_regs *i2c_base, uint8_t chip,
+                            uint32_t addr, int alen, uint8_t *buf, int len)
 {
-       u_int32_t       tmp;
+       uint32_t        tmp;
        int             i;
 
        if ((alen < 0) || (alen > 2)) {
-               printf("%s(): bogus address length %x\n", __FUNCTION__, alen);
-               return(1);
+               printf("%s(): bogus address length %x\n", __func__, alen);
+               return 1;
        }
 
-       if (wait_for_bus()) {return(1);}
+       if (_wait_for_bus(i2c_base))
+               return 1;
 
        if (alen != 0) {
                /* Start address phase */
                tmp = I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX;
-               REG(I2C_CNT) = alen;
-               REG(I2C_SA) = chip;
-               REG(I2C_CON) = tmp;
+               REG(&(i2c_base->i2c_cnt)) = alen;
+               REG(&(i2c_base->i2c_sa)) = chip;
+               REG(&(i2c_base->i2c_con)) = tmp;
 
-               tmp = poll_i2c_irq(I2C_STAT_XRDY | I2C_STAT_NACK);
+               tmp = _poll_i2c_irq(i2c_base, I2C_STAT_XRDY | I2C_STAT_NACK);
 
                CHECK_NACK();
 
                switch (alen) {
-                       case 2:
-                               /* Send address MSByte */
-                               if (tmp & I2C_STAT_XRDY) {
-                                       REG(I2C_DXR) = (addr >> 8) & 0xff;
-                               } else {
-                                       REG(I2C_CON) = 0;
-                                       return(1);
-                               }
-
-                               tmp = poll_i2c_irq(I2C_STAT_XRDY | I2C_STAT_NACK);
-
-                               CHECK_NACK();
-                               /* No break, fall through */
-                       case 1:
-                               /* Send address LSByte */
-                               if (tmp & I2C_STAT_XRDY) {
-                                       REG(I2C_DXR) = addr & 0xff;
-                               } else {
-                                       REG(I2C_CON) = 0;
-                                       return(1);
-                               }
-
-                               tmp = poll_i2c_irq(I2C_STAT_XRDY | I2C_STAT_NACK | I2C_STAT_ARDY);
-
-                               CHECK_NACK();
-
-                               if (!(tmp & I2C_STAT_ARDY)) {
-                                       REG(I2C_CON) = 0;
-                                       return(1);
-                               }
+               case 2:
+                       /* Send address MSByte */
+                       if (tmp & I2C_STAT_XRDY) {
+                               REG(&(i2c_base->i2c_dxr)) = (addr >> 8) & 0xff;
+                       } else {
+                               REG(&(i2c_base->i2c_con)) = 0;
+                               return 1;
+                       }
+
+                       tmp = _poll_i2c_irq(i2c_base,
+                                           I2C_STAT_XRDY | I2C_STAT_NACK);
+
+                       CHECK_NACK();
+                       /* No break, fall through */
+               case 1:
+                       /* Send address LSByte */
+                       if (tmp & I2C_STAT_XRDY) {
+                               REG(&(i2c_base->i2c_dxr)) = addr & 0xff;
+                       } else {
+                               REG(&(i2c_base->i2c_con)) = 0;
+                               return 1;
+                       }
+
+                       tmp = _poll_i2c_irq(i2c_base, I2C_STAT_XRDY |
+                                           I2C_STAT_NACK | I2C_STAT_ARDY);
+
+                       CHECK_NACK();
+
+                       if (!(tmp & I2C_STAT_ARDY)) {
+                               REG(&(i2c_base->i2c_con)) = 0;
+                               return 1;
+                       }
                }
        }
 
        /* Address phase is over, now read 'len' bytes and stop */
        tmp = I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_STP;
-       REG(I2C_CNT) = len & 0xffff;
-       REG(I2C_SA) = chip;
-       REG(I2C_CON) = tmp;
+       REG(&(i2c_base->i2c_cnt)) = len & 0xffff;
+       REG(&(i2c_base->i2c_sa)) = chip;
+       REG(&(i2c_base->i2c_con)) = tmp;
 
        for (i = 0; i < len; i++) {
-               tmp = poll_i2c_irq(I2C_STAT_RRDY | I2C_STAT_NACK | I2C_STAT_ROVR);
+               tmp = _poll_i2c_irq(i2c_base, I2C_STAT_RRDY | I2C_STAT_NACK |
+                                  I2C_STAT_ROVR);
 
                CHECK_NACK();
 
                if (tmp & I2C_STAT_RRDY) {
-                       buf[i] = REG(I2C_DRR);
+                       buf[i] = REG(&(i2c_base->i2c_drr));
                } else {
-                       REG(I2C_CON) = 0;
-                       return(1);
+                       REG(&(i2c_base->i2c_con)) = 0;
+                       return 1;
                }
        }
 
-       tmp = poll_i2c_irq(I2C_STAT_SCD | I2C_STAT_NACK);
+       tmp = _poll_i2c_irq(i2c_base, I2C_STAT_SCD | I2C_STAT_NACK);
 
        CHECK_NACK();
 
        if (!(tmp & I2C_STAT_SCD)) {
-               REG(I2C_CON) = 0;
-               return(1);
+               REG(&(i2c_base->i2c_con)) = 0;
+               return 1;
        }
 
-       flush_rx();
-       REG(I2C_STAT) = 0xffff;
-       REG(I2C_CNT) = 0;
-       REG(I2C_CON) = 0;
+       _flush_rx(i2c_base);
+       REG(&(i2c_base->i2c_stat)) = 0xffff;
+       REG(&(i2c_base->i2c_cnt)) = 0;
+       REG(&(i2c_base->i2c_con)) = 0;
 
-       return(0);
+       return 0;
 }
 
-
-int i2c_write(u_int8_t chip, u_int32_t addr, int alen, u_int8_t *buf, int len)
+static int _davinci_i2c_write(struct i2c_regs *i2c_base, uint8_t chip,
+                             uint32_t addr, int alen, uint8_t *buf, int len)
 {
-       u_int32_t       tmp;
+       uint32_t        tmp;
        int             i;
 
        if ((alen < 0) || (alen > 2)) {
-               printf("%s(): bogus address length %x\n", __FUNCTION__, alen);
-               return(1);
+               printf("%s(): bogus address length %x\n", __func__, alen);
+               return 1;
        }
        if (len < 0) {
-               printf("%s(): bogus length %x\n", __FUNCTION__, len);
-               return(1);
+               printf("%s(): bogus length %x\n", __func__, len);
+               return 1;
        }
 
-       if (wait_for_bus()) {return(1);}
+       if (_wait_for_bus(i2c_base))
+               return 1;
 
        /* Start address phase */
-       tmp = I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX | I2C_CON_STP;
-       REG(I2C_CNT) = (alen == 0) ? len & 0xffff : (len & 0xffff) + alen;
-       REG(I2C_SA) = chip;
-       REG(I2C_CON) = tmp;
+       tmp = I2C_CON_EN | I2C_CON_MST | I2C_CON_STT |
+               I2C_CON_TRX | I2C_CON_STP;
+       REG(&(i2c_base->i2c_cnt)) = (alen == 0) ?
+               len & 0xffff : (len & 0xffff) + alen;
+       REG(&(i2c_base->i2c_sa)) = chip;
+       REG(&(i2c_base->i2c_con)) = tmp;
 
        switch (alen) {
-               case 2:
-                       /* Send address MSByte */
-                       tmp = poll_i2c_irq(I2C_STAT_XRDY | I2C_STAT_NACK);
+       case 2:
+               /* Send address MSByte */
+               tmp = _poll_i2c_irq(i2c_base, I2C_STAT_XRDY | I2C_STAT_NACK);
 
-                       CHECK_NACK();
+               CHECK_NACK();
 
-                       if (tmp & I2C_STAT_XRDY) {
-                               REG(I2C_DXR) = (addr >> 8) & 0xff;
-                       } else {
-                               REG(I2C_CON) = 0;
-                               return(1);
-                       }
-                       /* No break, fall through */
-               case 1:
-                       /* Send address LSByte */
-                       tmp = poll_i2c_irq(I2C_STAT_XRDY | I2C_STAT_NACK);
+               if (tmp & I2C_STAT_XRDY) {
+                       REG(&(i2c_base->i2c_dxr)) = (addr >> 8) & 0xff;
+               } else {
+                       REG(&(i2c_base->i2c_con)) = 0;
+                       return 1;
+               }
+               /* No break, fall through */
+       case 1:
+               /* Send address LSByte */
+               tmp = _poll_i2c_irq(i2c_base, I2C_STAT_XRDY | I2C_STAT_NACK);
 
-                       CHECK_NACK();
+               CHECK_NACK();
 
-                       if (tmp & I2C_STAT_XRDY) {
-                               REG(I2C_DXR) = addr & 0xff;
-                       } else {
-                               REG(I2C_CON) = 0;
-                               return(1);
-                       }
+               if (tmp & I2C_STAT_XRDY) {
+                       REG(&(i2c_base->i2c_dxr)) = addr & 0xff;
+               } else {
+                       REG(&(i2c_base->i2c_con)) = 0;
+                       return 1;
+               }
        }
 
        for (i = 0; i < len; i++) {
-               tmp = poll_i2c_irq(I2C_STAT_XRDY | I2C_STAT_NACK);
+               tmp = _poll_i2c_irq(i2c_base, I2C_STAT_XRDY | I2C_STAT_NACK);
 
                CHECK_NACK();
 
-               if (tmp & I2C_STAT_XRDY) {
-                       REG(I2C_DXR) = buf[i];
-               } else {
-                       return(1);
-               }
+               if (tmp & I2C_STAT_XRDY)
+                       REG(&(i2c_base->i2c_dxr)) = buf[i];
+               else
+                       return 1;
        }
 
-       tmp = poll_i2c_irq(I2C_STAT_SCD | I2C_STAT_NACK);
+       tmp = _poll_i2c_irq(i2c_base, I2C_STAT_SCD | I2C_STAT_NACK);
 
        CHECK_NACK();
 
        if (!(tmp & I2C_STAT_SCD)) {
-               REG(I2C_CON) = 0;
-               return(1);
+               REG(&(i2c_base->i2c_con)) = 0;
+               return 1;
+       }
+
+       _flush_rx(i2c_base);
+       REG(&(i2c_base->i2c_stat)) = 0xffff;
+       REG(&(i2c_base->i2c_cnt)) = 0;
+       REG(&(i2c_base->i2c_con)) = 0;
+
+       return 0;
+}
+
+static int _davinci_i2c_probe_chip(struct i2c_regs *i2c_base, uint8_t chip)
+{
+       int     rc = 1;
+
+       if (chip == REG(&(i2c_base->i2c_oa)))
+               return rc;
+
+       REG(&(i2c_base->i2c_con)) = 0;
+       if (_wait_for_bus(i2c_base))
+               return 1;
+
+       /* try to read one byte from current (or only) address */
+       REG(&(i2c_base->i2c_cnt)) = 1;
+       REG(&(i2c_base->i2c_sa))  = chip;
+       REG(&(i2c_base->i2c_con)) = (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT |
+                                    I2C_CON_STP);
+       udelay(50000);
+
+       if (!(REG(&(i2c_base->i2c_stat)) & I2C_STAT_NACK)) {
+               rc = 0;
+               _flush_rx(i2c_base);
+               REG(&(i2c_base->i2c_stat)) = 0xffff;
+       } else {
+               REG(&(i2c_base->i2c_stat)) = 0xffff;
+               REG(&(i2c_base->i2c_con)) |= I2C_CON_STP;
+               udelay(20000);
+               if (_wait_for_bus(i2c_base))
+                       return 1;
+       }
+
+       _flush_rx(i2c_base);
+       REG(&(i2c_base->i2c_stat)) = 0xffff;
+       REG(&(i2c_base->i2c_cnt)) = 0;
+       return rc;
+}
+
+#ifndef CONFIG_DM_I2C
+static struct i2c_regs *davinci_get_base(struct i2c_adapter *adap)
+{
+       switch (adap->hwadapnr) {
+#if I2C_BUS_MAX >= 3
+       case 2:
+               return (struct i2c_regs *)I2C2_BASE;
+#endif
+#if I2C_BUS_MAX >= 2
+       case 1:
+               return (struct i2c_regs *)I2C1_BASE;
+#endif
+       case 0:
+               return (struct i2c_regs *)I2C_BASE;
+
+       default:
+               printf("wrong hwadapnr: %d\n", adap->hwadapnr);
+       }
+
+       return NULL;
+}
+
+static uint davinci_i2c_setspeed(struct i2c_adapter *adap, uint speed)
+{
+       struct i2c_regs *i2c_base = davinci_get_base(adap);
+       uint ret;
+
+       adap->speed = speed;
+       ret =  _davinci_i2c_setspeed(i2c_base, speed);
+
+       return ret;
+}
+
+static void davinci_i2c_init(struct i2c_adapter *adap, int speed,
+                            int slaveadd)
+{
+       struct i2c_regs *i2c_base = davinci_get_base(adap);
+
+       adap->speed = speed;
+       _davinci_i2c_init(i2c_base, speed, slaveadd);
+
+       return;
+}
+
+static int davinci_i2c_read(struct i2c_adapter *adap, uint8_t chip,
+                           uint32_t addr, int alen, uint8_t *buf, int len)
+{
+       struct i2c_regs *i2c_base = davinci_get_base(adap);
+       return _davinci_i2c_read(i2c_base, chip, addr, alen, buf, len);
+}
+
+static int davinci_i2c_write(struct i2c_adapter *adap, uint8_t chip,
+                            uint32_t addr, int alen, uint8_t *buf, int len)
+{
+       struct i2c_regs *i2c_base = davinci_get_base(adap);
+
+       return _davinci_i2c_write(i2c_base, chip, addr, alen, buf, len);
+}
+
+static int davinci_i2c_probe_chip(struct i2c_adapter *adap, uint8_t chip)
+{
+       struct i2c_regs *i2c_base = davinci_get_base(adap);
+
+       return _davinci_i2c_probe_chip(i2c_base, chip);
+}
+
+U_BOOT_I2C_ADAP_COMPLETE(davinci_0, davinci_i2c_init, davinci_i2c_probe_chip,
+                        davinci_i2c_read, davinci_i2c_write,
+                        davinci_i2c_setspeed,
+                        CONFIG_SYS_DAVINCI_I2C_SPEED,
+                        CONFIG_SYS_DAVINCI_I2C_SLAVE,
+                        0)
+
+#if I2C_BUS_MAX >= 2
+U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip,
+                        davinci_i2c_read, davinci_i2c_write,
+                        davinci_i2c_setspeed,
+                        CONFIG_SYS_DAVINCI_I2C_SPEED1,
+                        CONFIG_SYS_DAVINCI_I2C_SLAVE1,
+                        1)
+#endif
+
+#if I2C_BUS_MAX >= 3
+U_BOOT_I2C_ADAP_COMPLETE(davinci_2, davinci_i2c_init, davinci_i2c_probe_chip,
+                        davinci_i2c_read, davinci_i2c_write,
+                        davinci_i2c_setspeed,
+                        CONFIG_SYS_DAVINCI_I2C_SPEED2,
+                        CONFIG_SYS_DAVINCI_I2C_SLAVE2,
+                        2)
+#endif
+
+#else /* CONFIG_DM_I2C */
+
+static int davinci_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
+                         int nmsgs)
+{
+       struct i2c_bus *i2c_bus = dev_get_priv(bus);
+       int ret;
+
+       debug("i2c_xfer: %d messages\n", nmsgs);
+       for (; nmsgs > 0; nmsgs--, msg++) {
+               debug("i2c_xfer: chip=0x%x, len=0x%x\n", msg->addr, msg->len);
+               if (msg->flags & I2C_M_RD) {
+                       ret = _davinci_i2c_read(i2c_bus->regs, msg->addr,
+                               0, 0, msg->buf, msg->len);
+               } else {
+                       ret = _davinci_i2c_write(i2c_bus->regs, msg->addr,
+                               0, 0, msg->buf, msg->len);
+               }
+               if (ret) {
+                       debug("i2c_write: error sending\n");
+                       return -EREMOTEIO;
+               }
        }
 
-       flush_rx();
-       REG(I2C_STAT) = 0xffff;
-       REG(I2C_CNT) = 0;
-       REG(I2C_CON) = 0;
+       return ret;
+}
+
+static int davinci_i2c_set_speed(struct udevice *dev, uint speed)
+{
+       struct i2c_bus *i2c_bus = dev_get_priv(dev);
+
+       i2c_bus->speed = speed;
+       return _davinci_i2c_setspeed(i2c_bus->regs, speed);
+}
+
+static int davinci_i2c_probe(struct udevice *dev)
+{
+       struct i2c_bus *i2c_bus = dev_get_priv(dev);
+
+       i2c_bus->id = dev->seq;
+       i2c_bus->regs = (struct i2c_regs *)dev_get_addr(dev);
+
+       i2c_bus->speed = 100000;
+        _davinci_i2c_init(i2c_bus->regs, i2c_bus->speed, 0);
 
-       return(0);
+       return 0;
 }
+
+static int davinci_i2c_probe_chip(struct udevice *bus, uint chip_addr,
+                                 uint chip_flags)
+{
+       struct i2c_bus *i2c_bus = dev_get_priv(bus);
+
+       return _davinci_i2c_probe_chip(i2c_bus->regs, chip_addr);
+}
+
+static const struct dm_i2c_ops davinci_i2c_ops = {
+       .xfer           = davinci_i2c_xfer,
+       .probe_chip     = davinci_i2c_probe_chip,
+       .set_bus_speed  = davinci_i2c_set_speed,
+};
+
+static const struct udevice_id davinci_i2c_ids[] = {
+       { .compatible = "ti,davinci-i2c"},
+       { .compatible = "ti,keystone-i2c"},
+       { }
+};
+
+U_BOOT_DRIVER(i2c_davinci) = {
+       .name   = "i2c_davinci",
+       .id     = UCLASS_I2C,
+       .of_match = davinci_i2c_ids,
+       .probe  = davinci_i2c_probe,
+       .priv_auto_alloc_size = sizeof(struct i2c_bus),
+       .ops    = &davinci_i2c_ops,
+};
+
+#endif /* CONFIG_DM_I2C */