]> git.sur5r.net Git - u-boot/commitdiff
i2c: mxs: Use i2c_set_bus_speed() in i2c_init()
authorMarek Vasut <marex@denx.de>
Mon, 12 Nov 2012 14:34:30 +0000 (14:34 +0000)
committerTom Rini <trini@ti.com>
Tue, 11 Dec 2012 20:17:30 +0000 (13:17 -0700)
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

index 4152242d9638d5e39b22cd24259b9ead24f0c9e3..3771452b9f1a7cfc5a4e42d67eb21755820b3dc0 100644 (file)
@@ -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;
 }