commit a2d15da2bdbbacbf315b76917874bd62295493bc
author Troy Kisky <troy.kisky@boundarydevices.com> Thu Jul 19 08:18:17 2012 +0000
committer Heiko Schocher <hs@denx.de> Tue Jul 31 07:55:13 2012 +0200
tree 554b346ad9a3821ed73f5befaf9c7ee8db10fcbf
parent eca037a84ac0a468425456b7eae28d599fac02a4

mxc_i2c: add i2c_regs argument to i2c_imx_stop

This is prep work for CONFIG_I2C_MULTI_BUS.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>

drivers/i2c/mxc_i2c.c

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index cbb0fff..44a04b5 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -201,10 +201,9 @@
 /*
  * Stop I2C transaction
  */
-void i2c_imx_stop(void)
+static void i2c_imx_stop(struct mxc_i2c_regs *i2c_regs)
 {
 	int ret;
-	struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
 	unsigned int temp = readb(&i2c_regs->i2cr);
 
 	temp &= ~(I2CR_MSTA | I2CR_MTX);
@@ -271,7 +270,7 @@
 		ret = i2c_init_transfer_(i2c_regs, chip, addr, alen);
 		if (ret >= 0)
 			return 0;
-		i2c_imx_stop();
+		i2c_imx_stop(i2c_regs);
 		if (ret == -ENODEV)
 			return ret;
 
@@ -305,7 +304,7 @@
 
 	ret = tx_byte(i2c_regs, (chip << 1) | 1);
 	if (ret < 0) {
-		i2c_imx_stop();
+		i2c_imx_stop(i2c_regs);
 		return ret;
 	}
 
@@ -322,7 +321,7 @@
 	for (i = 0; i < len; i++) {
 		ret = wait_for_sr_state(i2c_regs, ST_IIF);
 		if (ret < 0) {
-			i2c_imx_stop();
+			i2c_imx_stop(i2c_regs);
 			return ret;
 		}
 
@@ -331,7 +330,7 @@
 		 * controller from generating another clock cycle
 		 */
 		if (i == (len - 1)) {
-			i2c_imx_stop();
+			i2c_imx_stop(i2c_regs);
 		} else if (i == (len - 2)) {
 			temp = readb(&i2c_regs->i2cr);
 			temp |= I2CR_TX_NO_AK;
@@ -340,9 +339,7 @@
 		writeb(0, &i2c_regs->i2sr);
 		buf[i] = readb(&i2c_regs->i2dr);
 	}
-
-	i2c_imx_stop();
-
+	i2c_imx_stop(i2c_regs);
 	return 0;
 }
 
@@ -364,9 +361,7 @@
 		if (ret < 0)
 			break;
 	}
-
-	i2c_imx_stop();
-
+	i2c_imx_stop(i2c_regs);
 	return ret;
 }