From: Manuel Lauss Date: Sat, 22 Oct 2011 11:34:38 +0000 (+0200) Subject: i2c-au1550: increase timeout waiting for master done X-Git-Tag: upstream/snapshot3+hdmi~8860^2~2^5~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84785f120f4d64c5fa8cf4bab1cf07c2507d434f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git i2c-au1550: increase timeout waiting for master done Double the timeout in the loop which busy-waits for the "master-done" bit to be set. This bit indicates whether an i2c transaction has completed; on the DB1300 and DB1550 boards this timeout is slightly too short and causes transactions to the WM8731 codec to be falsely flagged as failed. The timeout itself is necessary since transactions to non-existant slaves never set this bit in the first place (and cause i2cdetect to hang). With this change the WM8731 codec on the DB1300/DB1550 boards is correctly detected and initialized. Signed-off-by: Manuel Lauss Signed-off-by: Ben Dooks --- diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 98ee11a..4f5150c 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c @@ -101,7 +101,7 @@ static int wait_master_done(struct i2c_au1550_data *adap) int i; /* Wait for Master Done. */ - for (i = 0; i < adap->xfer_timeout; i++) { + for (i = 0; i < 2 * adap->xfer_timeout; i++) { if ((RD(adap, PSC_SMBEVNT) & PSC_SMBEVNT_MD) != 0) return 0; udelay(1);