commit 51de5a8eda6b01e8e36d459cce7eda5be0911d89
author Daisuke Nojiri <dnojiri@chromium.org> Thu Sep 18 12:35:09 2014 -0700
committer Patrick Georgi <pgeorgi@google.com> Tue Mar 24 15:27:29 2015 +0100
tree 1869f7541420bedcaa8ffc01ae7ced4a5fdc5a95
parent 7a757c942e74743ac5781ce03db671747b6f542b

rk3288: sync i2c driver with depthcharge

this change syncs the i2c driver with the one in depthcharge.

BUG=None
TEST=Booted Veyron Pinky
BRANCH=None

Change-Id: Ic9c7006770bba50fd412e0bcefc52f879b7195ec
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Commit-Id: 95ca6c88061062c0de95a8dd3567a71a372771b0
Original-Change-Id: I0d0fdefa58c5b4cc5c991be40796a800ccf074a5
Original-Reviewed-on: https://chromium-review.googlesource.com/218873
Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/8872
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)

src/soc/rockchip/rk3288/i2c.c

diff --git a/src/soc/rockchip/rk3288/i2c.c b/src/soc/rockchip/rk3288/i2c.c
index dab0178..9348b6c 100644
--- a/src/soc/rockchip/rk3288/i2c.c
+++ b/src/soc/rockchip/rk3288/i2c.c
@@ -33,7 +33,7 @@
 #define RETRY_COUNT	3
 /* 100000us = 100ms */
 #define I2C_TIMEOUT_US	100000
-#define I2C_BUS_MAX 6
+#define I2C_BUS_MAX	6
 #define I2C_NOACK	2
 #define I2C_TIMEOUT	3
 
@@ -148,7 +148,7 @@
 
 	writel(I2C_8BIT | segment.chip << 1 | 1, &reg_addr->i2c_mrxaddr);
 	writel(0, &reg_addr->i2c_mrxraddr);
-	con = I2C_MODE_TRX | I2C_EN;
+	con = I2C_MODE_TRX | I2C_EN | I2C_ACT2NAK;
 	while (bytes_remaining) {
 		bytes_transfered = MIN(bytes_remaining, 32);
 		bytes_remaining -= bytes_transfered;
@@ -175,7 +175,7 @@
 			printk(BIOS_ERR, "I2C Read::Recv Data Timeout\n");
 			writel(0, &reg_addr->i2c_mrxcnt);
 			writel(0, &reg_addr->i2c_con);
-			return	I2C_TIMEOUT;
+			return I2C_TIMEOUT;
 		}
 
 		for (i = 0; i < words_transfered; i++) {
@@ -187,7 +187,7 @@
 				*data++ = (rxdata >> (j * 8)) & 0xff;
 			}
 		}
-		con = I2C_MODE_RX | I2C_EN;
+		con = I2C_MODE_RX | I2C_EN | I2C_ACT2NAK;
 	}
 	return res;
 }
@@ -221,7 +221,7 @@
 		}
 
 		writel(I2C_CLEANI, &reg_addr->i2c_ipd);
-		writel(I2C_EN | I2C_MODE_TX, &reg_addr->i2c_con);
+		writel(I2C_EN | I2C_MODE_TX | I2C_ACT2NAK, &reg_addr->i2c_con);
 		writel(bytes_transfered, &reg_addr->i2c_mtxcnt);
 
 		timeout = I2C_TIMEOUT_US;
@@ -240,7 +240,7 @@
 			printk(BIOS_ERR, "I2C Write::Send Data Timeout\n");
 			writel(0, &reg_addr->i2c_mtxcnt);
 			writel(0, &reg_addr->i2c_con);
-			return	I2C_TIMEOUT;
+			return I2C_TIMEOUT;
 		}
 
 		bytes_remaining -= bytes_transfered;
@@ -266,7 +266,7 @@
 	int i;
 	int res = 0;
 	struct rk3288_i2c_regs *regs = i2c_bus[bus];
-	struct i2c_seg  *seg = segments;
+	struct i2c_seg *seg = segments;
 
 	for (i = 0; i < seg_count; i++, seg++) {
 		res = i2c_do_xfer(regs, *seg);