From: Wolfram Sang Date: Mon, 6 Apr 2009 14:27:45 +0000 (+0200) Subject: i2c: imx: Make disable_delay a per-device variable X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=65de394df21f8ccc61525f77b0e4ee6940a0932e;p=linux-2.6-omap-h63xx.git 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: Sascha Hauer Signed-off-by: Wolfram Sang Acked-by: Guennadi Liakhovetski Acked-by: Darius Augulis Signed-off-by: Ben Dooks --- diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 433d3486de0..0b486a63460 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -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 */