diff options
| author | Richard Zhao <linuxzsc@gmail.com> | 2009-10-17 11:46:23 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-11-03 00:28:47 +0100 |
| commit | a4094a76e6a45691b8f9108060b750a48b4c4563 (patch) | |
| tree | adac3b625b9033962e8fccae00aa61a28cfa148f /drivers/i2c | |
| parent | i2c: imx: check busy bit when START/STOP (diff) | |
| download | linux-a4094a76e6a45691b8f9108060b750a48b4c4563.tar.xz linux-a4094a76e6a45691b8f9108060b750a48b4c4563.zip | |
i2c: imx: only imx1 needs disable delay
check cpu_is_mx1() when disable delay.
Signed-off-by: Richard Zhao <linuxzsc@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 6055e92f0ac8..671d37c23f4c 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -225,11 +225,13 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx) writeb(temp, i2c_imx->base + IMX_I2C_I2CR); i2c_imx->stopped = 1; } - /* - * This delay caused by an i.MXL hardware bug. - * If no (or too short) delay, no "STOP" bit will be generated. - */ - udelay(i2c_imx->disable_delay); + if (cpu_is_mx1()) { + /* + * This delay caused by an i.MXL hardware bug. + * If no (or too short) delay, no "STOP" bit will be generated. + */ + udelay(i2c_imx->disable_delay); + } if (!i2c_imx->stopped) i2c_imx_bus_busy(i2c_imx, 0); |