[U-Boot] [PATCH 10/24] mxc_i2c: place i2c_reset code inline

Troy Kisky
2012-06-22T04:12:05Z

imx_reset is only referenced once so
move to that location.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
drivers/i2c/mxc_i2c.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index ac91872..2ef7b92 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -113,17 +113,6 @@ static uint8_t i2c_imx_get_clk(unsigned int rate)
}

/*
- * Reset I2C Controller
- */
-void i2c_reset(void)
-{
- struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
-
- writeb(0, &i2c_regs->i2cr); /* Reset module */
- writeb(0, &i2c_regs->i2sr);
-}
-
-/*
* Init I2C Bus
*/
void i2c_init(int speed, int unused)
@@ -135,7 +124,9 @@ void i2c_init(int speed, int unused)
/* Store divider value */
writeb(idx, &i2c_regs->ifdr);

- i2c_reset();
+ /* Reset module */
+ writeb(0, &i2c_regs->i2cr);
+ writeb(0, &i2c_regs->i2sr);
}

/*
--
1.7.9.5