From: Zhiwu Song Date: Tue, 13 Aug 2013 09:11:28 +0000 (+0800) Subject: i2c: sirf: we need to wait I2C_RESET status in resume X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ebae7dfab001890bc85d473275cc46611501664a;p=linux-beck.git i2c: sirf: we need to wait I2C_RESET status in resume this fixes the issue that we lost to wait the i2c reset finished. Signed-off-by: Zhiwu Song Signed-off-by: Barry Song Signed-off-by: Wolfram Sang --- diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c index ff47a767f756..efb51a1d97ca 100644 --- a/drivers/i2c/busses/i2c-sirf.c +++ b/drivers/i2c/busses/i2c-sirf.c @@ -422,6 +422,8 @@ static int i2c_sirfsoc_resume(struct device *dev) clk_enable(siic->clk); writel(SIRFSOC_I2C_RESET, siic->base + SIRFSOC_I2C_CTRL); + while (readl(siic->base + SIRFSOC_I2C_CTRL) & SIRFSOC_I2C_RESET) + cpu_relax(); writel(SIRFSOC_I2C_CORE_EN | SIRFSOC_I2C_MASTER_MODE, siic->base + SIRFSOC_I2C_CTRL); writel(siic->clk_div, siic->base + SIRFSOC_I2C_CLK_CTRL);