Commit 65de394d authored by Wolfram Sang's avatar Wolfram Sang Committed by Ben Dooks

i2c: imx: Make disable_delay a per-device variable

'disable_delay' was static which is wrong as it is calculated using the per-device
bus speed. This patch turns 'disable_delay' into a per-device variable.
Reported-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarDarius Augulis <augulis.darius@gmail.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent b486ddbc
......@@ -86,8 +86,6 @@
/** Variables ******************************************************************
*******************************************************************************/
static unsigned int disable_delay; /* Dummy delay */
/*
* sorted list of clock divider, register value pairs
* taken from table 26-5, p.26-9, Freescale i.MX
......@@ -121,6 +119,7 @@ struct imx_i2c_struct {
int irq;
wait_queue_head_t queue;
unsigned long i2csr;
unsigned int disable_delay;
};
/** Functions for IMX I2C adapter driver ***************************************
......@@ -212,7 +211,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
* This delay caused by an i.MXL hardware bug.
* If no (or too short) delay, no "STOP" bit will be generated.
*/
udelay(disable_delay);
udelay(i2c_imx->disable_delay);
/* Disable I2C controller */
writeb(0, i2c_imx->base + IMX_I2C_I2CR);
}
......@@ -243,7 +242,7 @@ static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,
* This delay is used in I2C bus disable function
* to fix chip hardware bug.
*/
disable_delay = (500000U * i2c_clk_div[i][0]
i2c_imx->disable_delay = (500000U * i2c_clk_div[i][0]
+ (i2c_clk_rate / 2) - 1) / (i2c_clk_rate / 2);
/* dev_dbg() can't be used, because adapter is not yet registered */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment