[U-Boot] [PATCH v3 0/4] i2c: UniPhier: add I2C drivers based on driver model

[U-Boot] [PATCH v3 0/4] i2c: UniPhier: add I2C drivers based on driver model

[Masahiro Yamada]

Masahiro Yamada (4):
  i2c: UniPhier: add driver for UniPhier i2c controller
  i2c: UniPhier: add driver for UniPhier FIFO-builtin i2c controller
  ARM: UniPhier: enable I2C for UniPhier SoCs
  ARM: UniPhier: enable CONFIG_I2C_EEPROM

 configs/ph1_ld4_defconfig    |   2 +
 configs/ph1_pro4_defconfig   |   2 +
 configs/ph1_sld8_defconfig   |   2 +
 drivers/i2c/Kconfig          |  22 +++
 drivers/i2c/Makefile         |   2 +
 drivers/i2c/i2c-uniphier-f.c | 374 +++++++++++++++++++++++++++++++++++++++++++
 drivers/i2c/i2c-uniphier.c   | 233 +++++++++++++++++++++++++++
 include/configs/uniphier.h   |   3 +
 8 files changed, 640 insertions(+)
 create mode 100644 drivers/i2c/i2c-uniphier-f.c
 create mode 100644 drivers/i2c/i2c-uniphier.c

-- 
1.9.1

[U-Boot] [PATCH v3 1/4] i2c: UniPhier: add driver for UniPhier i2c controller

[Masahiro Yamada]

This commit adds on-chip I2C driver used on some old Panasonic
UniPhier SoCs.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v3: None
Changes in v2:
  - Fix a typo.  s/freqency/frequency/
  - Add some comments to explain the formula calculating
    wait time.
  - add comments on every register
  - skip stop condition if the next message is read

 drivers/i2c/Kconfig        |  14 +++
 drivers/i2c/Makefile       |   1 +
 drivers/i2c/i2c-uniphier.c | 233 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 248 insertions(+)
 create mode 100644 drivers/i2c/i2c-uniphier.c

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index e69de29..6a479ef 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -0,0 +1,14 @@
+config DM_I2C
+	bool "Enable Driver Model for I2C drivers"
+	depends on DM
+	help
+	  If you want to use driver model for I2C drivers, say Y.
+	  To use legacy I2C drivers, say N.
+
+config SYS_I2C_UNIPHIER
+	bool "UniPhier I2C driver"
+	depends on ARCH_UNIPHIER && DM_I2C
+	default y
+	help
+	  Support for Panasonic UniPhier I2C controller driver.  This I2C
+	  controller is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 6f3c86c..e2fcd24 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -31,4 +31,5 @@ obj-$(CONFIG_SYS_I2C_SANDBOX) += sandbox_i2c.o i2c-emul-uclass.o
 obj-$(CONFIG_SYS_I2C_SH) += sh_i2c.o
 obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
 obj-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o
+obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o
 obj-$(CONFIG_SYS_I2C_ZYNQ) += zynq_i2c.o
diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c
new file mode 100644
index 0000000..5c39c3c
--- /dev/null
+++ b/drivers/i2c/i2c-uniphier.c
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2014 Panasonic Corporation
+ *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/errno.h>
+#include <dm/device.h>
+#include <dm/root.h>
+#include <i2c.h>
+#include <fdtdec.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define I2C_DTRM	0x00	/* data transmission */
+#define		I2C_DTRM_STA	(1 << 10)
+#define		I2C_DTRM_STO	(1 << 9)
+#define		I2C_DTRM_NACK	(1 << 8)
+#define		I2C_DTRM_RD	(1 << 0)
+#define I2C_DREC	0x04	/* data reception */
+#define		I2C_DREC_STS	(1 << 12)
+#define		I2C_DREC_LRB	(1 << 11)
+#define		I2C_DREC_LAB	(1 << 9)
+#define I2C_MYAD	0x08	/* slave address */
+#define I2C_CLK		0x0c	/* clock frequency control */
+#define I2C_BRST	0x10	/* bus reset */
+#define		I2C_BRST_FOEN	(1 << 1)
+#define		I2C_BRST_BRST	(1 << 0)
+#define I2C_HOLD	0x14	/* hold time control */
+#define I2C_BSTS	0x18	/* bus status monitor */
+#define I2C_NOISE	0x1c	/* noise filter control */
+#define I2C_SETUP	0x20	/* setup time control */
+
+#define IOBUS_FREQ	100000000
+
+struct uniphier_i2c_dev {
+	void __iomem *base;		/* register base */
+	unsigned long input_clk;	/* master clock (Hz) */
+	unsigned long wait_us;		/* wait for every byte transfer (us) */
+};
+
+static int uniphier_i2c_probe(struct udevice *dev)
+{
+	fdt_addr_t addr;
+	fdt_size_t size;
+	struct uniphier_i2c_dev *priv = dev_get_priv(dev);
+
+	addr = fdtdec_get_addr_size(gd->fdt_blob, dev->of_offset, "reg", &size);
+
+	priv->base = map_sysmem(addr, size);
+
+	if (!priv->base)
+		return -ENOMEM;
+
+	priv->input_clk = IOBUS_FREQ;
+
+	/* deassert reset */
+	writel(0x3, priv->base + I2C_BRST);
+
+	return 0;
+}
+
+static int uniphier_i2c_remove(struct udevice *dev)
+{
+	struct uniphier_i2c_dev *priv = dev_get_priv(dev);
+
+	unmap_sysmem(priv->base);
+
+	return 0;
+}
+
+static int uniphier_i2c_child_pre_probe(struct udevice *dev)
+{
+	struct dm_i2c_chip *i2c_chip = dev_get_parentdata(dev);
+
+	if (dev->of_offset == -1)
+		return 0;
+	return i2c_chip_ofdata_to_platdata(gd->fdt_blob, dev->of_offset,
+					   i2c_chip);
+}
+
+static int send_and_recv_byte(struct uniphier_i2c_dev *dev, u32 dtrm)
+{
+	writel(dtrm, dev->base + I2C_DTRM);
+
+	/*
+	 * This controller only provides interruption to inform the completion
+	 * of each byte transfer.  (No status register to poll it.)
+	 * Unfortunately, U-Boot does not have a good support of interrupt.
+	 * Wait for a while.
+	 */
+	udelay(dev->wait_us);
+
+	return readl(dev->base + I2C_DREC);
+}
+
+static int send_byte(struct uniphier_i2c_dev *dev, u32 dtrm, bool *stop)
+{
+	int ret = 0;
+	u32 drec;
+
+	drec = send_and_recv_byte(dev, dtrm);
+
+	if (drec & I2C_DREC_LAB) {
+		debug("uniphier_i2c: bus arbitration failed\n");
+		*stop = false;
+		ret = -EREMOTEIO;
+	}
+	if (drec & I2C_DREC_LRB) {
+		debug("uniphier_i2c: slave did not return ACK\n");
+		ret = -EREMOTEIO;
+	}
+	return ret;
+}
+
+static int uniphier_i2c_transmit(struct uniphier_i2c_dev *dev, uint addr,
+				 uint len, const u8 *buf, bool *stop)
+{
+	int ret;
+
+	ret = send_byte(dev, I2C_DTRM_STA | I2C_DTRM_NACK | addr << 1, stop);
+	if (ret < 0)
+		goto fail;
+
+	while (len--) {
+		ret = send_byte(dev, I2C_DTRM_NACK | *buf++, stop);
+		if (ret < 0)
+			goto fail;
+	}
+
+fail:
+	if (*stop)
+		writel(I2C_DTRM_STO | I2C_DTRM_NACK, dev->base + I2C_DTRM);
+
+	return ret;
+}
+
+static int uniphier_i2c_receive(struct uniphier_i2c_dev *dev, uint addr,
+				uint len, u8 *buf, bool *stop)
+{
+	int ret;
+
+	ret = send_byte(dev, I2C_DTRM_STA | I2C_DTRM_NACK |
+			I2C_DTRM_RD | addr << 1, stop);
+	if (ret < 0)
+		goto fail;
+
+	while (len--)
+		*buf++ = send_and_recv_byte(dev, len ? 0 : I2C_DTRM_NACK);
+
+fail:
+	if (*stop)
+		writel(I2C_DTRM_STO | I2C_DTRM_NACK, dev->base + I2C_DTRM);
+
+	return ret;
+}
+
+static int uniphier_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
+			     int nmsgs)
+{
+	int ret = 0;
+	struct uniphier_i2c_dev *dev = dev_get_priv(bus);
+	bool stop;
+
+	for (; nmsgs > 0; nmsgs--, msg++) {
+		/* If next message is read, skip the stop condition */
+		stop = nmsgs > 1 && msg[1].flags & I2C_M_RD ? false : true;
+
+		if (msg->flags & I2C_M_RD)
+			ret = uniphier_i2c_receive(dev, msg->addr, msg->len,
+						   msg->buf, &stop);
+		else
+			ret = uniphier_i2c_transmit(dev, msg->addr, msg->len,
+						    msg->buf, &stop);
+
+		if (ret < 0)
+			break;
+	}
+
+	return ret;
+}
+
+static int uniphier_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
+{
+	struct uniphier_i2c_dev *priv = dev_get_priv(bus);
+
+	/* max supported frequency is 400 kHz */
+	if (speed > 400000)
+		return -EINVAL;
+
+	/* bus reset: make sure the bus is idle when change the frequency */
+	writel(0x1, priv->base + I2C_BRST);
+
+	writel((priv->input_clk / speed / 2 << 16) | (priv->input_clk / speed),
+	       priv->base + I2C_CLK);
+
+	writel(0x3, priv->base + I2C_BRST);
+
+	/*
+	 * Theoretically, each byte can be transferred in
+	 * 1000000 * 9 / speed usec.  For safety, wait more than double.
+	 */
+	priv->wait_us = 20000000 / speed;
+
+	return 0;
+}
+
+
+static const struct dm_i2c_ops uniphier_i2c_ops = {
+	.xfer = uniphier_i2c_xfer,
+	.set_bus_speed = uniphier_i2c_set_bus_speed,
+};
+
+static const struct udevice_id uniphier_i2c_of_match[] = {
+	{ .compatible = "panasonic,uniphier-i2c" },
+	{},
+};
+
+U_BOOT_DRIVER(uniphier_i2c) = {
+	.name = "uniphier-i2c",
+	.id = UCLASS_I2C,
+	.of_match = uniphier_i2c_of_match,
+	.probe = uniphier_i2c_probe,
+	.remove = uniphier_i2c_remove,
+	.per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
+	.child_pre_probe = uniphier_i2c_child_pre_probe,
+	.priv_auto_alloc_size = sizeof(struct uniphier_i2c_dev),
+	.ops = &uniphier_i2c_ops,
+};
-- 
1.9.1

[U-Boot] [PATCH v3 2/4] i2c: UniPhier: add driver for UniPhier FIFO-builtin i2c controller

[Masahiro Yamada]

This commit adds on-chip I2C driver used on newer SoCs of Panasonic
UniPhier platform.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v3:
  - Fix a bug in that device busy is checked even if the stop
    condition is not issued.

Changes in v2:
  - Fix a typo. s/freqency/frequency/
  - Rename the struct member for clarification.   s/wait_us/timeout/
  - Add comments on all the registers
  - Skip stop condition if the next message is read

 drivers/i2c/Kconfig          |   8 +
 drivers/i2c/Makefile         |   1 +
 drivers/i2c/i2c-uniphier-f.c | 374 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 383 insertions(+)
 create mode 100644 drivers/i2c/i2c-uniphier-f.c

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 6a479ef..202ea5d 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -12,3 +12,11 @@ config SYS_I2C_UNIPHIER
 	help
 	  Support for Panasonic UniPhier I2C controller driver.  This I2C
 	  controller is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
+
+config SYS_I2C_UNIPHIER_F
+	bool "UniPhier FIFO-builtin I2C driver"
+	depends on ARCH_UNIPHIER && DM_I2C
+	default y
+	help
+	  Support for Panasonic UniPhier FIFO-builtin I2C controller driver.
+	  This I2C controller is used on PH1-Pro4 or newer UniPhier SoCs.
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index e2fcd24..0e4c9f4 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -32,4 +32,5 @@ obj-$(CONFIG_SYS_I2C_SH) += sh_i2c.o
 obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
 obj-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o
 obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o
+obj-$(CONFIG_SYS_I2C_UNIPHIER_F) += i2c-uniphier-f.o
 obj-$(CONFIG_SYS_I2C_ZYNQ) += zynq_i2c.o
diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c
new file mode 100644
index 0000000..8b163fd
--- /dev/null
+++ b/drivers/i2c/i2c-uniphier-f.c
@@ -0,0 +1,374 @@
+/*
+ * Copyright (C) 2014 Panasonic Corporation
+ *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/errno.h>
+#include <dm/device.h>
+#include <dm/root.h>
+#include <i2c.h>
+#include <fdtdec.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define I2C_CR		0x00		/* control register */
+#define		I2C_CR_MST	(1 << 3)	/* master mode */
+#define		I2C_CR_STA	(1 << 2)	/* start condition */
+#define		I2C_CR_STO	(1 << 1)	/* stop condition */
+#define		I2C_CR_NACK	(1 << 0)	/* not ACK */
+
+#define I2C_DTTX	0x04		/* send FIFO */
+#define I2C_DTRX	0x04		/* receive FIFO */
+#define		I2C_DTTX_CMD	(1 << 8)	/* send command (slave addr) */
+#define		I2C_DTTX_RD	(1 << 0)	/* read */
+#define I2C_SLAD	0x0c		/* slave address */
+#define I2C_CYC		0x10		/* clock cycle control */
+#define I2C_LCTL	0x14		/* clock low period control */
+#define I2C_SSUT	0x18		/* restart/stop setup time control */
+#define I2C_DSUT	0x1c		/* data setup time control */
+#define I2C_INT		0x20		/* interrupt status */
+#define I2C_IE		0x24		/* interrupt enable */
+#define I2C_IC		0x28		/* interrupt clear */
+#define		I2C_INT_TE	(1 << 9)	/* TX FIFO empty */
+#define		I2C_INT_RB	(1 << 4)	/* received specified bytes */
+#define		I2C_INT_NA	(1 << 2)	/* no answer */
+#define		I2C_INT_AL	(1 << 1)	/* arbitration lost */
+#define I2C_SR		0x2c		/* status register */
+#define		I2C_SR_DB	(1 << 12)	/* device busy */
+#define		I2C_SR_BB	(1 << 8)	/* bus busy */
+#define		I2C_SR_RFF	(1 << 3)	/* Rx FIFO full */
+#define		I2C_SR_RNE	(1 << 2)	/* Rx FIFO not empty */
+#define		I2C_SR_TNF	(1 << 1)	/* Tx FIFO not full */
+#define		I2C_SR_TFE	(1 << 0)	/* Tx FIFO empty */
+#define I2C_RST		0x34	/* reset control */
+#define		I2C_RST_TBRST	(1 << 2)	/* clear Tx FIFO */
+#define		I2C_RST_RBRST	(1 << 1)	/* clear Rx FIFO */
+#define		I2C_RST_RST	(1 << 0)	/* forcible bus reset */
+#define I2C_BM		0x38	/* bus monitor */
+#define I2C_NOISE	0x3c	/* noise filter control */
+#define I2C_TBC		0x40	/* Tx byte count setting */
+#define I2C_RBC		0x44	/* Rx byte count setting */
+#define I2C_TBCM	0x48	/* Tx byte count monitor */
+#define I2C_RBCM	0x4c	/* Rx byte count monitor */
+#define I2C_BRST	0x50	/* bus reset */
+#define		I2C_BRST_FOEN	(1 << 1)	/* normal operation */
+#define		I2C_BRST_RSCLO	(1 << 0)	/* release SCL low fixing */
+
+#define FIOCLK	50000000
+
+struct uniphier_fi2c_dev {
+	void __iomem *base;		/* register base */
+	unsigned long fioclk;		/* internal operation clock */
+	unsigned long timeout;		/* time out (us) */
+};
+
+static int poll_status(struct uniphier_fi2c_dev *dev, int offset, u32 flag)
+{
+	int wait = 1000000; /* 1 sec */
+
+	while (readl(dev->base + offset) & flag) {
+		if (wait-- < 0)
+			return -EREMOTEIO;
+		udelay(1);
+	}
+
+	return 0;
+}
+
+static int reset_bus(struct uniphier_fi2c_dev *dev)
+{
+	int ret;
+
+	/* bus forcible reset */
+	writel(I2C_RST_RST, dev->base + I2C_RST);
+	ret = poll_status(dev, I2C_RST, I2C_RST_RST);
+	if (ret < 0)
+		debug("error: fail to reset I2C controller\n");
+
+	return ret;
+}
+
+static int check_device_busy(struct uniphier_fi2c_dev *dev)
+{
+	int ret;
+
+	ret = poll_status(dev, I2C_SR, I2C_SR_DB);
+	if (ret < 0) {
+		debug("error: device busy too long. reset...\n");
+		ret = reset_bus(dev);
+	}
+
+	return ret;
+}
+
+static int uniphier_fi2c_probe(struct udevice *dev)
+{
+	fdt_addr_t addr;
+	fdt_size_t size;
+	struct uniphier_fi2c_dev *priv = dev_get_priv(dev);
+	int ret;
+
+	addr = fdtdec_get_addr_size(gd->fdt_blob, dev->of_offset, "reg",
+				    &size);
+
+	priv->base = map_sysmem(addr, size);
+
+	if (!priv->base)
+		return -ENOMEM;
+
+	priv->fioclk = FIOCLK;
+
+	/* bus forcible reset */
+	ret = reset_bus(priv);
+	if (ret < 0)
+		return ret;
+
+	writel(I2C_BRST_FOEN | I2C_BRST_RSCLO, priv->base + I2C_BRST);
+
+	return 0;
+}
+
+static int uniphier_fi2c_remove(struct udevice *dev)
+{
+	struct uniphier_fi2c_dev *priv = dev_get_priv(dev);
+
+	unmap_sysmem(priv->base);
+
+	return 0;
+}
+
+static int uniphier_fi2c_child_pre_probe(struct udevice *dev)
+{
+	struct dm_i2c_chip *i2c_chip = dev_get_parentdata(dev);
+
+	if (dev->of_offset == -1)
+		return 0;
+	return i2c_chip_ofdata_to_platdata(gd->fdt_blob, dev->of_offset,
+					   i2c_chip);
+}
+
+static int wait_for_irq(struct uniphier_fi2c_dev *dev, u32 flags,
+			bool *stop)
+{
+	u32 irq;
+	unsigned long wait = dev->timeout;
+	int ret = -EREMOTEIO;
+
+	do {
+		udelay(1);
+		irq = readl(dev->base + I2C_INT);
+	} while (!(irq & flags) && wait--);
+
+	if (wait < 0) {
+		debug("error: time out\n");
+		return ret;
+	}
+
+	if (irq & I2C_INT_AL) {
+		debug("error: arbitration lost\n");
+		*stop = false;
+		return ret;
+	}
+
+	if (irq & I2C_INT_NA) {
+		debug("error: no answer\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+int issue_stop(struct uniphier_fi2c_dev *dev, int old_ret)
+{
+	int ret;
+
+	debug("stop condition\n");
+	writel(I2C_CR_MST | I2C_CR_STO, dev->base + I2C_CR);
+
+	ret = poll_status(dev, I2C_SR, I2C_SR_DB);
+	if (ret < 0)
+		debug("error: device busy after operation\n");
+
+	return old_ret ? old_ret : ret;
+}
+
+static int uniphier_fi2c_transmit(struct uniphier_fi2c_dev *dev, uint addr,
+				  uint len, const u8 *buf, bool *stop)
+{
+	int ret;
+	const u32 irq_flags = I2C_INT_TE | I2C_INT_NA | I2C_INT_AL;
+
+	debug("%s: addr = %x, len = %d\n", __func__, addr, len);
+
+	writel(I2C_DTTX_CMD | addr << 1, dev->base + I2C_DTTX);
+
+	writel(irq_flags, dev->base + I2C_IE);
+	writel(irq_flags, dev->base + I2C_IC);
+
+	debug("start condition\n");
+	writel(I2C_CR_MST | I2C_CR_STA, dev->base + I2C_CR);
+
+	ret = wait_for_irq(dev, irq_flags, stop);
+	if (ret < 0)
+		goto error;
+
+	while (len--) {
+		debug("sending %x\n", *buf);
+		writel(*buf++, dev->base + I2C_DTTX);
+
+		writel(irq_flags, dev->base + I2C_IC);
+
+		ret = wait_for_irq(dev, irq_flags, stop);
+		if (ret < 0)
+			goto error;
+	}
+
+error:
+	writel(irq_flags, dev->base + I2C_IC);
+
+	if (*stop)
+		ret = issue_stop(dev, ret);
+
+	return ret;
+}
+
+static int uniphier_fi2c_receive(struct uniphier_fi2c_dev *dev, uint addr,
+				 uint len, u8 *buf, bool *stop)
+{
+	int ret = 0;
+	const u32 irq_flags = I2C_INT_RB | I2C_INT_NA | I2C_INT_AL;
+
+	debug("%s: addr = %x, len = %d\n", __func__, addr, len);
+
+	/*
+	 * In case 'len == 0', only the slave address should be sent
+	 * for probing, which is covered by the transmit function.
+	 */
+	if (len == 0)
+		return uniphier_fi2c_transmit(dev, addr, len, buf, stop);
+
+	writel(I2C_DTTX_CMD | I2C_DTTX_RD | addr << 1, dev->base + I2C_DTTX);
+
+	writel(0, dev->base + I2C_RBC);
+	writel(irq_flags, dev->base + I2C_IE);
+	writel(irq_flags, dev->base + I2C_IC);
+
+	debug("start condition\n");
+	writel(I2C_CR_MST | I2C_CR_STA | (len == 1 ? I2C_CR_NACK : 0),
+	       dev->base + I2C_CR);
+
+	while (len--) {
+		ret = wait_for_irq(dev, irq_flags, stop);
+		if (ret < 0)
+			goto error;
+
+		*buf++ = readl(dev->base + I2C_DTRX);
+		debug("received %x\n", *(buf - 1));
+
+		if (len == 1)
+			writel(I2C_CR_MST | I2C_CR_NACK, dev->base + I2C_CR);
+
+		writel(irq_flags, dev->base + I2C_IC);
+	}
+
+error:
+	writel(irq_flags, dev->base + I2C_IC);
+
+	if (*stop)
+		ret = issue_stop(dev, ret);
+
+	return ret;
+}
+
+static int uniphier_fi2c_xfer(struct udevice *bus, struct i2c_msg *msg,
+			     int nmsgs)
+{
+	int ret;
+	struct uniphier_fi2c_dev *dev = dev_get_priv(bus);
+	bool stop;
+
+
+	ret = check_device_busy(dev);
+	if (ret < 0)
+		return ret;
+
+	for (; nmsgs > 0; nmsgs--, msg++) {
+		/* If next message is read, skip the stop condition */
+		stop = nmsgs > 1 && msg[1].flags & I2C_M_RD ? false : true;
+
+		if (msg->flags & I2C_M_RD)
+			ret = uniphier_fi2c_receive(dev, msg->addr, msg->len,
+						    msg->buf, &stop);
+		else
+			ret = uniphier_fi2c_transmit(dev, msg->addr, msg->len,
+						     msg->buf, &stop);
+
+		if (ret < 0)
+			break;
+	}
+
+	return ret;
+}
+
+static int uniphier_fi2c_set_bus_speed(struct udevice *bus, unsigned int speed)
+{
+	struct uniphier_fi2c_dev *dev = dev_get_priv(bus);
+	unsigned int clk_count;
+	int ret;
+
+	/* max supported frequency is 400 kHz */
+	if (speed > 400000)
+		return -EINVAL;
+
+	ret = check_device_busy(dev);
+	if (ret < 0)
+		return ret;
+
+	/* make sure the bus is idle when changing the frequency */
+	writel(I2C_BRST_RSCLO, dev->base + I2C_BRST);
+
+	clk_count = dev->fioclk / speed;
+
+	writel(clk_count, dev->base + I2C_CYC);
+	writel(clk_count / 2, dev->base + I2C_LCTL);
+	writel(clk_count / 2, dev->base + I2C_SSUT);
+	writel(clk_count / 16, dev->base + I2C_DSUT);
+
+	writel(I2C_BRST_FOEN | I2C_BRST_RSCLO, dev->base + I2C_BRST);
+
+	/*
+	 * Theoretically, each byte can be transferred in
+	 * 1000000 * 9 / speed usec.
+	 * This time out value is long enough.
+	 */
+	dev->timeout = 100000000L / speed;
+
+	return 0;
+}
+
+static const struct dm_i2c_ops uniphier_fi2c_ops = {
+	.xfer = uniphier_fi2c_xfer,
+	.set_bus_speed = uniphier_fi2c_set_bus_speed,
+};
+
+static const struct udevice_id uniphier_fi2c_of_match[] = {
+	{ .compatible = "panasonic,uniphier-fi2c" },
+	{},
+};
+
+U_BOOT_DRIVER(uniphier_fi2c) = {
+	.name = "uniphier-fi2c",
+	.id = UCLASS_I2C,
+	.of_match = uniphier_fi2c_of_match,
+	.probe = uniphier_fi2c_probe,
+	.remove = uniphier_fi2c_remove,
+	.per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
+	.child_pre_probe = uniphier_fi2c_child_pre_probe,
+	.priv_auto_alloc_size = sizeof(struct uniphier_fi2c_dev),
+	.ops = &uniphier_fi2c_ops,
+};
-- 
1.9.1

[U-Boot] [PATCH v3 3/4] ARM: UniPhier: enable I2C for UniPhier SoCs

[Masahiro Yamada]

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v3: None
Changes in v2: None

 configs/ph1_ld4_defconfig  | 2 ++
 configs/ph1_pro4_defconfig | 2 ++
 configs/ph1_sld8_defconfig | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig
index 2e9dd00..86b4b15 100644
--- a/configs/ph1_ld4_defconfig
+++ b/configs/ph1_ld4_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_LOADB=y
 CONFIG_CMD_LOADS=y
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_ECHO=y
 CONFIG_CMD_ITEST=y
@@ -34,6 +35,7 @@ CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_SERIAL=y
 CONFIG_UNIPHIER_SERIAL=y
+CONFIG_DM_I2C=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig
index 5dca64b..242bcf9 100644
--- a/configs/ph1_pro4_defconfig
+++ b/configs/ph1_pro4_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_LOADB=y
 CONFIG_CMD_LOADS=y
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_ECHO=y
 CONFIG_CMD_ITEST=y
@@ -34,6 +35,7 @@ CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_SERIAL=y
 CONFIG_UNIPHIER_SERIAL=y
+CONFIG_DM_I2C=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index 2a6e334..8e95f17 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_LOADB=y
 CONFIG_CMD_LOADS=y
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_ECHO=y
 CONFIG_CMD_ITEST=y
@@ -34,6 +35,7 @@ CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
 CONFIG_DM_SERIAL=y
 CONFIG_UNIPHIER_SERIAL=y
+CONFIG_DM_I2C=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
-- 
1.9.1

[U-Boot] [PATCH v3 4/4] ARM: UniPhier: enable CONFIG_I2C_EEPROM

[Masahiro Yamada]

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

To apply this commit, the following must be applied in advance:
http://patchwork.ozlabs.org/patch/422543/


Changes in v3: None
Changes in v2: None

 include/configs/uniphier.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 5a53c50..9ad47f6 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -43,6 +43,9 @@
 #define CONFIG_SDRAM1_SIZE	0x10000000
 #endif
 
+#define CONFIG_I2C_EEPROM
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
+
 /*
  * Support card address map
  */
-- 
1.9.1

[U-Boot] [PATCH v3 1/4] i2c: UniPhier: add driver for UniPhier i2c controller

[Heiko Schocher]

Hello Masahiro,

Am 26.12.2014 04:07, schrieb Masahiro Yamada:
> This commit adds on-chip I2C driver used on some old Panasonic
> UniPhier SoCs.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v3: None
> Changes in v2:
>    - Fix a typo.  s/freqency/frequency/
>    - Add some comments to explain the formula calculating
>      wait time.
>    - add comments on every register
>    - skip stop condition if the next message is read
>
>   drivers/i2c/Kconfig        |  14 +++
>   drivers/i2c/Makefile       |   1 +
>   drivers/i2c/i2c-uniphier.c | 233 +++++++++++++++++++++++++++++++++++++++++++++
>   3 files changed, 248 insertions(+)
>   create mode 100644 drivers/i2c/i2c-uniphier.c
>
> diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
> index e69de29..6a479ef 100644
> --- a/drivers/i2c/Kconfig
> +++ b/drivers/i2c/Kconfig
> @@ -0,0 +1,14 @@
> +config DM_I2C
> +	bool "Enable Driver Model for I2C drivers"
> +	depends on DM
> +	help
> +	  If you want to use driver model for I2C drivers, say Y.
> +	  To use legacy I2C drivers, say N.

This change seems not related to the "add driver for UniPhier i2c
controller" topic ...

Beside of that, you can add my

Acked-by: Heiko Schocher <hs@denx.de>

to the hole serie. I think this should go to the u-boot-dm tree from
Simon, as it depends on DM changes, or?

Simon? Is this OK for you?

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH v3 1/4] i2c: UniPhier: add driver for UniPhier i2c controller

[Masahiro YAMADA]

Hi Heiko,

2015-01-05 15:52 GMT+09:00 Heiko Schocher <hs@denx.de>:
> Hello Masahiro,
>
> Am 26.12.2014 04:07, schrieb Masahiro Yamada:
>
>> This commit adds on-chip I2C driver used on some old Panasonic
>> UniPhier SoCs.
>>
>> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>> Changes in v3: None
>> Changes in v2:
>>    - Fix a typo.  s/freqency/frequency/
>>    - Add some comments to explain the formula calculating
>>      wait time.
>>    - add comments on every register
>>    - skip stop condition if the next message is read
>>
>>   drivers/i2c/Kconfig        |  14 +++
>>   drivers/i2c/Makefile       |   1 +
>>   drivers/i2c/i2c-uniphier.c | 233
>> +++++++++++++++++++++++++++++++++++++++++++++
>>   3 files changed, 248 insertions(+)
>>   create mode 100644 drivers/i2c/i2c-uniphier.c
>>
>> diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
>> index e69de29..6a479ef 100644
>> --- a/drivers/i2c/Kconfig
>> +++ b/drivers/i2c/Kconfig
>> @@ -0,0 +1,14 @@
>> +config DM_I2C
>> +       bool "Enable Driver Model for I2C drivers"
>> +       depends on DM
>> +       help
>> +         If you want to use driver model for I2C drivers, say Y.
>> +         To use legacy I2C drivers, say N.
>
>
> This change seems not related to the "add driver for UniPhier i2c
> controller" topic ...


OK, I can split it into two patches.





> Beside of that, you can add my
>
> Acked-by: Heiko Schocher <hs@denx.de>
>
> to the hole serie. I think this should go to the u-boot-dm tree from
> Simon, as it depends on DM changes, or?
>
> Simon? Is this OK for you?
>


I do not mind if Simon is willing to apply it to u-boot-dm.







-- 
Best Regards
Masahiro Yamada

[U-Boot] [PATCH v3 1/4] i2c: UniPhier: add driver for UniPhier i2c controller

[Simon Glass]

Hi,

On 5 January 2015 at 06:35, Masahiro YAMADA <yamada.m@jp.panasonic.com> wrote:
> Hi Heiko,
>
> 2015-01-05 15:52 GMT+09:00 Heiko Schocher <hs@denx.de>:
>> Hello Masahiro,
>>
>> Am 26.12.2014 04:07, schrieb Masahiro Yamada:
>>
>>> This commit adds on-chip I2C driver used on some old Panasonic
>>> UniPhier SoCs.
>>>
>>> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
>>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>> ---
>>>
>>> Changes in v3: None
>>> Changes in v2:
>>>    - Fix a typo.  s/freqency/frequency/
>>>    - Add some comments to explain the formula calculating
>>>      wait time.
>>>    - add comments on every register
>>>    - skip stop condition if the next message is read
>>>
>>>   drivers/i2c/Kconfig        |  14 +++
>>>   drivers/i2c/Makefile       |   1 +
>>>   drivers/i2c/i2c-uniphier.c | 233
>>> +++++++++++++++++++++++++++++++++++++++++++++
>>>   3 files changed, 248 insertions(+)
>>>   create mode 100644 drivers/i2c/i2c-uniphier.c
>>>
>>> diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
>>> index e69de29..6a479ef 100644
>>> --- a/drivers/i2c/Kconfig
>>> +++ b/drivers/i2c/Kconfig
>>> @@ -0,0 +1,14 @@
>>> +config DM_I2C
>>> +       bool "Enable Driver Model for I2C drivers"
>>> +       depends on DM
>>> +       help
>>> +         If you want to use driver model for I2C drivers, say Y.
>>> +         To use legacy I2C drivers, say N.
>>
>>
>> This change seems not related to the "add driver for UniPhier i2c
>> controller" topic ...
>
>
> OK, I can split it into two patches.
>
>
>
>
>
>> Beside of that, you can add my
>>
>> Acked-by: Heiko Schocher <hs@denx.de>
>>
>> to the hole serie. I think this should go to the u-boot-dm tree from
>> Simon, as it depends on DM changes, or?
>>
>> Simon? Is this OK for you?
>>
>
>
> I do not mind if Simon is willing to apply it to u-boot-dm.

Yes, that's fine. But please do cc me as otherwise I miss messages. So
much activity these days...

Regards,
Simon