Patchwork [U-Boot,6/7] i2c: mxs: Use i2c_set_bus_speed() in i2c_init()

login
register
mail settings
Submitter Marek Vasut
Date Nov. 13, 2012, 12:34 a.m.
Message ID <1352766871-892-6-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/198510/
State Awaiting Upstream
Delegated to: Heiko Schocher
Headers show

Comments

Marek Vasut - Nov. 13, 2012, 12:34 a.m.
Use i2c_set_bus_speed() in i2c_init() within the mxs i2c driver
to avoid duplication of code.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/i2c/mxs_i2c.c |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

Patch

diff --git a/drivers/i2c/mxs_i2c.c b/drivers/i2c/mxs_i2c.c
index 4152242..3771452 100644
--- a/drivers/i2c/mxs_i2c.c
+++ b/drivers/i2c/mxs_i2c.c
@@ -287,22 +287,8 @@  unsigned int i2c_get_bus_speed(void)
 
 void i2c_init(int speed, int slaveadd)
 {
-	struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE;
-	struct mxs_i2c_speed_table *spd = mxs_i2c_speed_to_cfg(speed);
-
-	if (!spd) {
-		printf("MXS I2C: Invalid speed selected (%d Hz)\n", speed);
-		return;
-	}
-
 	mxs_i2c_reset();
-
-	writel(spd->timing0, &i2c_regs->hw_i2c_timing0);
-	writel(spd->timing1, &i2c_regs->hw_i2c_timing1);
-
-	writel((0x0015 << I2C_TIMING2_BUS_FREE_OFFSET) |
-		(0x000d << I2C_TIMING2_LEADIN_COUNT_OFFSET),
-		&i2c_regs->hw_i2c_timing2);
+	i2c_set_bus_speed(speed);
 
 	return;
 }