浏览代码

i2c: sirf: retry 3 times as sometimes we get random noack and timeout

let i2c core retry 3 times as sometimes we get random noack and timeout
even when we access an existing i2c client.

Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Zhiwu Song 12 年之前
父节点
当前提交
617da00cb1
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/i2c/busses/i2c-sirf.c

+ 2 - 1
drivers/i2c/busses/i2c-sirf.c

@@ -229,7 +229,7 @@ static int i2c_sirfsoc_xfer_msg(struct sirfsoc_i2c *siic, struct i2c_msg *msg)
 		while (readl(siic->base + SIRFSOC_I2C_CTRL) & SIRFSOC_I2C_RESET)
 		while (readl(siic->base + SIRFSOC_I2C_CTRL) & SIRFSOC_I2C_RESET)
 			cpu_relax();
 			cpu_relax();
 	}
 	}
-	return siic->err_status ? -EIO : 0;
+	return siic->err_status ? -EAGAIN : 0;
 }
 }
 
 
 static u32 i2c_sirfsoc_func(struct i2c_adapter *adap)
 static u32 i2c_sirfsoc_func(struct i2c_adapter *adap)
@@ -333,6 +333,7 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
 
 
 	adap->algo = &i2c_sirfsoc_algo;
 	adap->algo = &i2c_sirfsoc_algo;
 	adap->algo_data = siic;
 	adap->algo_data = siic;
+	adap->retries = 3;
 
 
 	adap->dev.of_node = pdev->dev.of_node;
 	adap->dev.of_node = pdev->dev.of_node;
 	adap->dev.parent = &pdev->dev;
 	adap->dev.parent = &pdev->dev;