]> git.sur5r.net Git - u-boot/blobdiff - drivers/i2c/rcar_i2c.c
power: pmic: Let PFUZE3000 see all 256 registers
[u-boot] / drivers / i2c / rcar_i2c.c
index 90ad116a982e7c10618280b33b47a8057eab9445..8d87c737136b6bf3252257c6e57d9d3e6d15b7cd 100644 (file)
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * drivers/i2c/rcar_i2c.c
  *
- * Copyright (C) 2013 Renesas Electronics Corporation
- * Copyright (C) 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
+ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  *
- * SPDX-License-Identifier: GPL-2.0
+ * Clock configuration based on Linux i2c-rcar.c:
+ * Copyright (C) 2014-15 Wolfram Sang <wsa@sang-engineering.com>
+ * Copyright (C) 2011-2015 Renesas Electronics Corporation
+ * Copyright (C) 2012-14 Renesas Solutions Corp.
+ *   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
  */
 
 #include <common.h>
+#include <clk.h>
+#include <dm.h>
 #include <i2c.h>
 #include <asm/io.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-struct rcar_i2c {
-       u32 icscr;
-       u32 icmcr;
-       u32 icssr;
-       u32 icmsr;
-       u32 icsier;
-       u32 icmier;
-       u32 icccr;
-       u32 icsar;
-       u32 icmar;
-       u32 icrxdtxd;
-       u32 icccr2;
-       u32 icmpr;
-       u32 ichpr;
-       u32 iclpr;
-};
-
-#define MCR_MDBS       0x80    /* non-fifo mode switch */
-#define MCR_FSCL       0x40    /* override SCL pin     */
-#define MCR_FSDA       0x20    /* override SDA pin     */
-#define MCR_OBPC       0x10    /* override pins        */
-#define MCR_MIE                0x08    /* master if enable     */
-#define MCR_TSBE       0x04
-#define MCR_FSB                0x02    /* force stop bit       */
-#define MCR_ESG                0x01    /* en startbit gen.     */
-
-#define MSR_MASK       0x7f
-#define MSR_MNR                0x40    /* nack received        */
-#define MSR_MAL                0x20    /* arbitration lost     */
-#define MSR_MST                0x10    /* sent a stop          */
-#define MSR_MDE                0x08
-#define MSR_MDT                0x04
-#define MSR_MDR                0x02
-#define MSR_MAT                0x01    /* slave addr xfer done */
-
-static const struct rcar_i2c *i2c_dev[CONFIF_SYS_RCAR_I2C_NUM_CONTROLLERS] = {
-       (struct rcar_i2c *)CONFIG_SYS_RCAR_I2C0_BASE,
-       (struct rcar_i2c *)CONFIG_SYS_RCAR_I2C1_BASE,
-       (struct rcar_i2c *)CONFIG_SYS_RCAR_I2C2_BASE,
-       (struct rcar_i2c *)CONFIG_SYS_RCAR_I2C3_BASE,
+#include <wait_bit.h>
+
+#define RCAR_I2C_ICSCR                 0x00
+#define RCAR_I2C_ICMCR                 0x04
+#define RCAR_I2C_ICMCR_MDBS            BIT(7)
+#define RCAR_I2C_ICMCR_FSCL            BIT(6)
+#define RCAR_I2C_ICMCR_FSDA            BIT(5)
+#define RCAR_I2C_ICMCR_OBPC            BIT(4)
+#define RCAR_I2C_ICMCR_MIE             BIT(3)
+#define RCAR_I2C_ICMCR_TSBE            BIT(2)
+#define RCAR_I2C_ICMCR_FSB             BIT(1)
+#define RCAR_I2C_ICMCR_ESG             BIT(0)
+#define RCAR_I2C_ICSSR                 0x08
+#define RCAR_I2C_ICMSR                 0x0c
+#define RCAR_I2C_ICMSR_MASK            0x7f
+#define RCAR_I2C_ICMSR_MNR             BIT(6)
+#define RCAR_I2C_ICMSR_MAL             BIT(5)
+#define RCAR_I2C_ICMSR_MST             BIT(4)
+#define RCAR_I2C_ICMSR_MDE             BIT(3)
+#define RCAR_I2C_ICMSR_MDT             BIT(2)
+#define RCAR_I2C_ICMSR_MDR             BIT(1)
+#define RCAR_I2C_ICMSR_MAT             BIT(0)
+#define RCAR_I2C_ICSIER                        0x10
+#define RCAR_I2C_ICMIER                        0x14
+#define RCAR_I2C_ICCCR                 0x18
+#define RCAR_I2C_ICCCR_SCGD_OFF                3
+#define RCAR_I2C_ICSAR                 0x1c
+#define RCAR_I2C_ICMAR                 0x20
+#define RCAR_I2C_ICRXD_ICTXD           0x24
+
+struct rcar_i2c_priv {
+       void __iomem            *base;
+       struct clk              clk;
+       u32                     intdelay;
+       u32                     icccr;
 };
 
-static void rcar_i2c_raw_rw_common(struct rcar_i2c *dev, u8 chip, uint addr)
+static int rcar_i2c_finish(struct udevice *dev)
 {
-       /* set slave address */
-       writel(chip << 1, &dev->icmar);
-       /* set register address */
-       writel(addr, &dev->icrxdtxd);
-       /* clear status */
-       writel(0, &dev->icmsr);
-       /* start master send */
-       writel(MCR_MDBS | MCR_MIE | MCR_ESG, &dev->icmcr);
-
-       while ((readl(&dev->icmsr) & (MSR_MAT | MSR_MDE))
-               != (MSR_MAT | MSR_MDE))
-               udelay(10);
-
-       /* clear ESG */
-       writel(MCR_MDBS | MCR_MIE, &dev->icmcr);
-       /* start SCLclk */
-       writel(~(MSR_MAT | MSR_MDE), &dev->icmsr);
-
-       while (!(readl(&dev->icmsr) & MSR_MDE))
-               udelay(10);
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       int ret;
+
+       ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMSR, RCAR_I2C_ICMSR_MST,
+                               true, 10, true);
+
+       writel(0, priv->base + RCAR_I2C_ICSSR);
+       writel(0, priv->base + RCAR_I2C_ICMSR);
+       writel(0, priv->base + RCAR_I2C_ICMCR);
+
+       return ret;
 }
 
-static void rcar_i2c_raw_rw_finish(struct rcar_i2c *dev)
+static void rcar_i2c_recover(struct udevice *dev)
 {
-       while (!(readl(&dev->icmsr) & MSR_MST))
-               udelay(10);
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       u32 mcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_OBPC;
+       u32 mcra = mcr | RCAR_I2C_ICMCR_FSDA;
+       int i;
 
-       writel(0, &dev->icmcr);
+       /* Send 9 SCL pulses */
+       for (i = 0; i < 9; i++) {
+               writel(mcra | RCAR_I2C_ICMCR_FSCL, priv->base + RCAR_I2C_ICMCR);
+               udelay(5);
+               writel(mcra, priv->base + RCAR_I2C_ICMCR);
+               udelay(5);
+       }
+
+       /* Send stop condition */
+       udelay(5);
+       writel(mcra, priv->base + RCAR_I2C_ICMCR);
+       udelay(5);
+       writel(mcr, priv->base + RCAR_I2C_ICMCR);
+       udelay(5);
+       writel(mcr | RCAR_I2C_ICMCR_FSCL, priv->base + RCAR_I2C_ICMCR);
+       udelay(5);
+       writel(mcra | RCAR_I2C_ICMCR_FSCL, priv->base + RCAR_I2C_ICMCR);
+       udelay(5);
 }
 
-static int
-rcar_i2c_raw_write(struct rcar_i2c *dev, u8 chip, uint addr, u8 *val, int size)
+static int rcar_i2c_set_addr(struct udevice *dev, u8 chip, u8 read)
 {
-       rcar_i2c_raw_rw_common(dev, chip, addr);
-
-       /* set send date */
-       writel(*val, &dev->icrxdtxd);
-       /* start SCLclk */
-       writel(~MSR_MDE, &dev->icmsr);
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       u32 mask = RCAR_I2C_ICMSR_MAT |
+                  (read ? RCAR_I2C_ICMSR_MDR : RCAR_I2C_ICMSR_MDE);
+       u32 val;
+       int ret;
+
+       writel(0, priv->base + RCAR_I2C_ICMIER);
+       writel(RCAR_I2C_ICMCR_MDBS, priv->base + RCAR_I2C_ICMCR);
+       writel(0, priv->base + RCAR_I2C_ICMSR);
+       writel(priv->icccr, priv->base + RCAR_I2C_ICCCR);
+
+       ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMCR,
+                               RCAR_I2C_ICMCR_FSDA, false, 2, true);
+       if (ret) {
+               rcar_i2c_recover(dev);
+               val = readl(priv->base + RCAR_I2C_ICMSR);
+               if (val & RCAR_I2C_ICMCR_FSDA) {
+                       dev_err(dev, "Bus busy, aborting\n");
+                       return ret;
+               }
+       }
 
-       while (!(readl(&dev->icmsr) & MSR_MDE))
-               udelay(10);
+       writel((chip << 1) | read, priv->base + RCAR_I2C_ICMAR);
+       writel(0, priv->base + RCAR_I2C_ICMSR);
+       writel(RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE | RCAR_I2C_ICMCR_ESG,
+              priv->base + RCAR_I2C_ICMCR);
 
-       /* set stop condition */
-       writel(MCR_MDBS | MCR_MIE | MCR_FSB, &dev->icmcr);
-       /* start SCLclk */
-       writel(~MSR_MDE, &dev->icmsr);
+       ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMSR, mask,
+                               true, 100, true);
+       if (ret)
+               return ret;
 
-       rcar_i2c_raw_rw_finish(dev);
+       /* Check NAK */
+       if (readl(priv->base + RCAR_I2C_ICMSR) & RCAR_I2C_ICMSR_MNR)
+               return -EREMOTEIO;
 
        return 0;
 }
 
-static u8
-rcar_i2c_raw_read(struct rcar_i2c *dev, u8 chip, uint addr)
+static int rcar_i2c_read_common(struct udevice *dev, struct i2c_msg *msg)
 {
-       u8 ret;
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       u32 icmcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE;
+       int i, ret = -EREMOTEIO;
 
-       rcar_i2c_raw_rw_common(dev, chip, addr);
+       ret = rcar_i2c_set_addr(dev, msg->addr, 1);
+       if (ret)
+               return ret;
 
-       /* set slave address, receive */
-       writel((chip << 1) | 1, &dev->icmar);
-       /* start master receive */
-       writel(MCR_MDBS | MCR_MIE | MCR_ESG, &dev->icmcr);
-       /* clear status */
-       writel(0, &dev->icmsr);
+       for (i = 0; i < msg->len; i++) {
+               if (msg->len - 1 == i)
+                       icmcr |= RCAR_I2C_ICMCR_FSB;
 
-       while ((readl(&dev->icmsr) & (MSR_MAT | MSR_MDR))
-               != (MSR_MAT | MSR_MDR))
-               udelay(10);
+               writel(icmcr, priv->base + RCAR_I2C_ICMCR);
+               writel(~RCAR_I2C_ICMSR_MDR, priv->base + RCAR_I2C_ICMSR);
 
-       /* clear ESG */
-       writel(MCR_MDBS | MCR_MIE, &dev->icmcr);
-       /* prepare stop condition */
-       writel(MCR_MDBS | MCR_MIE | MCR_FSB, &dev->icmcr);
-       /* start SCLclk */
-       writel(~(MSR_MAT | MSR_MDR), &dev->icmsr);
+               ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMSR,
+                                       RCAR_I2C_ICMSR_MDR, true, 100, true);
+               if (ret)
+                       return ret;
 
-       while (!(readl(&dev->icmsr) & MSR_MDR))
-               udelay(10);
-
-       /* get receive data */
-       ret = (u8)readl(&dev->icrxdtxd);
-       /* start SCLclk */
-       writel(~MSR_MDR, &dev->icmsr);
+               msg->buf[i] = readl(priv->base + RCAR_I2C_ICRXD_ICTXD) & 0xff;
+       }
 
-       rcar_i2c_raw_rw_finish(dev);
+       writel(~RCAR_I2C_ICMSR_MDR, priv->base + RCAR_I2C_ICMSR);
 
-       return ret;
+       return rcar_i2c_finish(dev);
 }
 
-/*
- * SCL  = iicck / (20 + SCGD * 8 + F[(ticf + tr + intd) * iicck])
- * iicck  : I2C internal clock < 20 MHz
- * ticf : I2C SCL falling time: 35 ns
- * tr   : I2C SCL rising time:  200 ns
- * intd : LSI internal delay:   I2C0: 50 ns I2C1-3: 5
- * F[n] : n rounded up to an integer
- */
-static u32 rcar_clock_gen(int i2c_no, u32 bus_speed)
+static int rcar_i2c_write_common(struct udevice *dev, struct i2c_msg *msg)
 {
-       u32 iicck, f, scl, scgd;
-       u32 intd = 5;
-
-       int bit = 0, cdf_width = 3;
-       for (bit = 0; bit < (1 << cdf_width); bit++) {
-               iicck = CONFIG_HP_CLK_FREQ / (1 + bit);
-               if (iicck < 20000000)
-                       break;
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       u32 icmcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE;
+       int i, ret = -EREMOTEIO;
+
+       ret = rcar_i2c_set_addr(dev, msg->addr, 0);
+       if (ret)
+               return ret;
+
+       for (i = 0; i < msg->len; i++) {
+               writel(msg->buf[i], priv->base + RCAR_I2C_ICRXD_ICTXD);
+               writel(icmcr, priv->base + RCAR_I2C_ICMCR);
+               writel(~RCAR_I2C_ICMSR_MDE, priv->base + RCAR_I2C_ICMSR);
+
+               ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMSR,
+                                       RCAR_I2C_ICMSR_MDE, true, 100, true);
+               if (ret)
+                       return ret;
        }
 
-       if (bit > (1 << cdf_width)) {
-               puts("rcar-i2c: Can not get CDF\n");
-               return 0;
-       }
+       writel(~RCAR_I2C_ICMSR_MDE, priv->base + RCAR_I2C_ICMSR);
+       icmcr |= RCAR_I2C_ICMCR_FSB;
+       writel(icmcr, priv->base + RCAR_I2C_ICMCR);
 
-       if (i2c_no == 0)
-               intd = 50;
+       return rcar_i2c_finish(dev);
+}
 
-       f = (35 + 200 + intd) * (iicck / 1000000000);
+static int rcar_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs)
+{
+       int ret;
 
-       for (scgd = 0; scgd < 0x40; scgd++) {
-               scl = iicck / (20 + (scgd * 8) + f);
-               if (scl <= bus_speed)
-                       break;
-       }
+       for (; nmsgs > 0; nmsgs--, msg++) {
+               if (msg->flags & I2C_M_RD)
+                       ret = rcar_i2c_read_common(dev, msg);
+               else
+                       ret = rcar_i2c_write_common(dev, msg);
 
-       if (scgd > 0x40) {
-               puts("rcar-i2c: Can not get SDGB\n");
-               return 0;
+               if (ret)
+                       return -EREMOTEIO;
        }
 
-       debug("%s: scl: %d\n", __func__, scl);
-       debug("%s: bit %x\n", __func__, bit);
-       debug("%s: scgd %x\n", __func__, scgd);
-       debug("%s: iccr %x\n", __func__, (scgd << (cdf_width) | bit));
+       return ret;
+}
+
+static int rcar_i2c_probe_chip(struct udevice *dev, uint addr, uint flags)
+{
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       int ret;
 
-       return scgd << (cdf_width) | bit;
+       /* Ignore address 0, slave address */
+       if (addr == 0)
+               return -EINVAL;
+
+       ret = rcar_i2c_set_addr(dev, addr, 1);
+       writel(0, priv->base + RCAR_I2C_ICMSR);
+       return ret;
 }
 
-static void
-rcar_i2c_init(struct i2c_adapter *adap, int speed, int slaveadd)
+static int rcar_i2c_set_speed(struct udevice *dev, uint bus_freq_hz)
 {
-       struct rcar_i2c *dev = (struct rcar_i2c *)i2c_dev[adap->hwadapnr];
-       u32 icccr = 0;
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       u32 scgd, cdf, round, ick, sum, scl;
+       unsigned long rate;
 
-       /* No i2c support prior to relocation */
-       if (!(gd->flags & GD_FLG_RELOC))
-               return;
+       /*
+        * calculate SCL clock
+        * see
+        *      ICCCR
+        *
+        * ick  = clkp / (1 + CDF)
+        * SCL  = ick / (20 + SCGD * 8 + F[(ticf + tr + intd) * ick])
+        *
+        * ick  : I2C internal clock < 20 MHz
+        * ticf : I2C SCL falling time
+        * tr   : I2C SCL rising  time
+        * intd : LSI internal delay
+        * clkp : peripheral_clk
+        * F[]  : integer up-valuation
+        */
+       rate = clk_get_rate(&priv->clk);
+       cdf = rate / 20000000;
+       if (cdf >= 8) {
+               dev_err(dev, "Input clock %lu too high\n", rate);
+               return -EIO;
+       }
+       ick = rate / (cdf + 1);
 
        /*
-        * reset slave mode.
-        * slave mode is not used on this driver
+        * it is impossible to calculate large scale
+        * number on u32. separate it
+        *
+        * F[(ticf + tr + intd) * ick] with sum = (ticf + tr + intd)
+        *  = F[sum * ick / 1000000000]
+        *  = F[(ick / 1000000) * sum / 1000]
         */
-       writel(0, &dev->icsier);
-       writel(0, &dev->icsar);
-       writel(0, &dev->icscr);
-       writel(0, &dev->icssr);
+       sum = 35 + 200 + priv->intdelay;
+       round = (ick + 500000) / 1000000 * sum;
+       round = (round + 500) / 1000;
 
-       /* reset master mode */
-       writel(0, &dev->icmier);
-       writel(0, &dev->icmcr);
-       writel(0, &dev->icmsr);
-       writel(0, &dev->icmar);
-
-       icccr = rcar_clock_gen(adap->hwadapnr, adap->speed);
-       if (icccr == 0)
-               puts("I2C: Init failed\n");
-       else
-               writel(icccr, &dev->icccr);
-}
+       /*
+        * SCL  = ick / (20 + SCGD * 8 + F[(ticf + tr + intd) * ick])
+        *
+        * Calculation result (= SCL) should be less than
+        * bus_speed for hardware safety
+        *
+        * We could use something along the lines of
+        *      div = ick / (bus_speed + 1) + 1;
+        *      scgd = (div - 20 - round + 7) / 8;
+        *      scl = ick / (20 + (scgd * 8) + round);
+        * (not fully verified) but that would get pretty involved
+        */
+       for (scgd = 0; scgd < 0x40; scgd++) {
+               scl = ick / (20 + (scgd * 8) + round);
+               if (scl <= bus_freq_hz)
+                       goto scgd_find;
+       }
+       dev_err(dev, "it is impossible to calculate best SCL\n");
+       return -EIO;
 
-static int rcar_i2c_read(struct i2c_adapter *adap, uint8_t chip,
-                       uint addr, int alen, u8 *data, int len)
-{
-       struct rcar_i2c *dev = (struct rcar_i2c *)i2c_dev[adap->hwadapnr];
-       int i;
+scgd_find:
+       dev_dbg(dev, "clk %d/%d(%lu), round %u, CDF:0x%x, SCGD: 0x%x\n",
+               scl, bus_freq_hz, clk_get_rate(&priv->clk), round, cdf, scgd);
 
-       for (i = 0; i < len; i++)
-               data[i] = rcar_i2c_raw_read(dev, chip, addr + i);
+       priv->icccr = (scgd << RCAR_I2C_ICCCR_SCGD_OFF) | cdf;
+       writel(priv->icccr, priv->base + RCAR_I2C_ICCCR);
 
        return 0;
 }
 
-static int rcar_i2c_write(struct i2c_adapter *adap, uint8_t chip, uint addr,
-                       int alen, u8 *data, int len)
+static int rcar_i2c_probe(struct udevice *dev)
 {
-       struct rcar_i2c *dev = (struct rcar_i2c *)i2c_dev[adap->hwadapnr];
-       return rcar_i2c_raw_write(dev, chip, addr, data, len);
-}
+       struct rcar_i2c_priv *priv = dev_get_priv(dev);
+       int ret;
 
-static int
-rcar_i2c_probe(struct i2c_adapter *adap, u8 dev)
-{
-       return rcar_i2c_read(adap, dev, 0, 0, NULL, 0);
-}
+       priv->base = dev_read_addr_ptr(dev);
+       priv->intdelay = dev_read_u32_default(dev,
+                                             "i2c-scl-internal-delay-ns", 5);
+
+       ret = clk_get_by_index(dev, 0, &priv->clk);
+       if (ret)
+               return ret;
+
+       ret = clk_enable(&priv->clk);
+       if (ret)
+               return ret;
+
+       /* reset slave mode */
+       writel(0, priv->base + RCAR_I2C_ICSIER);
+       writel(0, priv->base + RCAR_I2C_ICSAR);
+       writel(0, priv->base + RCAR_I2C_ICSCR);
+       writel(0, priv->base + RCAR_I2C_ICSSR);
+
+       /* reset master mode */
+       writel(0, priv->base + RCAR_I2C_ICMIER);
+       writel(0, priv->base + RCAR_I2C_ICMCR);
+       writel(0, priv->base + RCAR_I2C_ICMSR);
+       writel(0, priv->base + RCAR_I2C_ICMAR);
+
+       ret = rcar_i2c_set_speed(dev, 100000);
+       if (ret)
+               clk_disable(&priv->clk);
 
-static unsigned int rcar_i2c_set_bus_speed(struct i2c_adapter *adap,
-                       unsigned int speed)
-{
-       struct rcar_i2c *dev = (struct rcar_i2c *)i2c_dev[adap->hwadapnr];
-       u32 icccr;
-       int ret = 0;
-
-       rcar_i2c_raw_rw_finish(dev);
-
-       icccr = rcar_clock_gen(adap->hwadapnr, speed);
-       if (icccr == 0) {
-               puts("I2C: Init failed\n");
-               ret = -1;
-       } else {
-               writel(icccr, &dev->icccr);
-       }
        return ret;
 }
 
-/*
- * Register RCAR i2c adapters
- */
-U_BOOT_I2C_ADAP_COMPLETE(rcar_0, rcar_i2c_init, rcar_i2c_probe, rcar_i2c_read,
-                        rcar_i2c_write, rcar_i2c_set_bus_speed,
-                        CONFIG_SYS_RCAR_I2C0_SPEED, 0, 0)
-U_BOOT_I2C_ADAP_COMPLETE(rcar_1, rcar_i2c_init, rcar_i2c_probe, rcar_i2c_read,
-                        rcar_i2c_write, rcar_i2c_set_bus_speed,
-                        CONFIG_SYS_RCAR_I2C1_SPEED, 0, 1)
-U_BOOT_I2C_ADAP_COMPLETE(rcar_2, rcar_i2c_init, rcar_i2c_probe, rcar_i2c_read,
-                        rcar_i2c_write, rcar_i2c_set_bus_speed,
-                        CONFIG_SYS_RCAR_I2C2_SPEED, 0, 2)
-U_BOOT_I2C_ADAP_COMPLETE(rcar_3, rcar_i2c_init, rcar_i2c_probe, rcar_i2c_read,
-                        rcar_i2c_write, rcar_i2c_set_bus_speed,
-                        CONFIG_SYS_RCAR_I2C3_SPEED, 0, 3)
+static const struct dm_i2c_ops rcar_i2c_ops = {
+       .xfer           = rcar_i2c_xfer,
+       .probe_chip     = rcar_i2c_probe_chip,
+       .set_bus_speed  = rcar_i2c_set_speed,
+};
+
+static const struct udevice_id rcar_i2c_ids[] = {
+       { .compatible = "renesas,rcar-gen2-i2c" },
+       { }
+};
+
+U_BOOT_DRIVER(i2c_rcar) = {
+       .name           = "i2c_rcar",
+       .id             = UCLASS_I2C,
+       .of_match       = rcar_i2c_ids,
+       .probe          = rcar_i2c_probe,
+       .priv_auto_alloc_size = sizeof(struct rcar_i2c_priv),
+       .ops            = &rcar_i2c_ops,
+};