Patchwork i2c: imx: retry on NAK

login
register
mail settings
Submitter Luka Perkov
Date Sept. 10, 2013, 11:58 p.m.
Message ID <1378857490-30968-1-git-send-email-luka@openwrt.org>
Download mbox | patch
Permalink /patch/274088/
State Rejected
Headers show

Comments

Luka Perkov - Sept. 10, 2013, 11:58 p.m.
From: Tim Harvey <tharvey@gateworks.com>

In case of busy i2c try again to get ACK.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Tested-by: Luka Perkov <luka@openwrt.org>
---
 drivers/i2c/busses/i2c-imx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Wolfram Sang - Feb. 18, 2014, 5:48 p.m.
On Wed, Sep 11, 2013 at 01:58:10AM +0200, Luka Perkov wrote:
> From: Tim Harvey <tharvey@gateworks.com>
> 
> In case of busy i2c try again to get ACK.
> 
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> Tested-by: Luka Perkov <luka@openwrt.org>

-EAGAIN is for lost arbitration (see Documentation/i2c/fault-codes).
In that case, the core will try again. NACK needs to be reported, so the
caller can decide what to do in that case. -ENXIO would be the best
response here.

Patch

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index ccf4665..c64afe6 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -62,6 +62,7 @@ 
 
 /* Default value */
 #define IMX_I2C_BIT_RATE	100000	/* 100kHz */
+#define IMX_I2C_MAX_RETRIES	3	/* number of retries to attempt */
 
 /* IMX I2C registers:
  * the I2C register offset is different between SoCs,
@@ -298,7 +299,7 @@  static int i2c_imx_acked(struct imx_i2c_struct *i2c_imx)
 {
 	if (imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR) & I2SR_RXAK) {
 		dev_dbg(&i2c_imx->adapter.dev, "<%s> No ACK\n", __func__);
-		return -EIO;  /* No ACK */
+		return -EAGAIN; /* try again */
 	}
 
 	dev_dbg(&i2c_imx->adapter.dev, "<%s> ACK received\n", __func__);
@@ -633,6 +634,7 @@  static int __init i2c_imx_probe(struct platform_device *pdev)
 	i2c_imx->adapter.dev.parent	= &pdev->dev;
 	i2c_imx->adapter.nr 		= pdev->id;
 	i2c_imx->adapter.dev.of_node	= pdev->dev.of_node;
+	i2c_imx->adapter.retries	= IMX_I2C_MAX_RETRIES;
 	i2c_imx->base			= base;
 
 	/* Get I2C clock */