From: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
To: linux-i2c@vger.kernel.org
Cc: wsa@the-dreams.de, robh+dt@kernel.org, robert.jarzmik@free.fr,
yizhang@marvell.com, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, Shouming Wang <wangshm@marvell.com>,
Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Subject: [PATCH-v4 03/11] i2c: pxa: Return I2C_RETRY when timeout in pio mode
Date: Tue, 14 Jul 2015 13:06:42 +0530 [thread overview]
Message-ID: <1436859410-28878-4-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1436859410-28878-1-git-send-email-vaibhav.hiremath@linaro.org>
From: Shouming Wang <wangshm@marvell.com>
In case of timeout in pio mode of operation return I2C_RETRY.
This behavior will be same as interrupt mode of operation.
Signed-off-by: Shouming Wang <wangshm@marvell.com>
[vaibhav.hiremath@linaro.org: Updated changelog]
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
drivers/i2c/busses/i2c-pxa.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 023e59f..632008f 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -745,8 +745,10 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c,
ret = i2c->msg_idx;
out:
- if (timeout == 0)
+ if (timeout == 0) {
i2c_pxa_scream_blue_murder(i2c, "timeout");
+ ret = I2C_RETRY;
+ }
return ret;
}
--
1.9.1
next prev parent reply other threads:[~2015-07-14 7:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 7:36 [PATCH-v4 00/11] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 01/11] i2c: pxa: keep i2c irq ON in suspend Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 02/11] i2c: pxa: No need to set slave addr for i2c master mode reset Vaibhav Hiremath
2015-07-14 7:36 ` Vaibhav Hiremath [this message]
2015-07-14 7:36 ` [PATCH-v4 04/11] i2c: pxa: Fix compile warning in 64bit mode Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 05/11] i2c: pxa: Update debug function to dump more info on error Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 06/11] i2c:pxa: Use devm_ variants in probe function Vaibhav Hiremath
2015-07-14 11:35 ` Wolfram Sang
2015-07-14 11:39 ` Vaibhav Hiremath
2015-07-14 11:45 ` Wolfram Sang
2015-07-14 7:36 ` [PATCH-v4 07/11] i2c: pxa: enable/disable i2c module across msg xfer Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 08/11] Documentation: binding: add new property 'disable_after_xfer' to i2c-pxa Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 09/11] i2c: pxa: Add support for pxa910/988 & new configuration features Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 10/11] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Vaibhav Hiremath
2015-07-14 7:36 ` [PATCH-v4 11/11] Documentation: binding: add sclk adjustment properties to i2c-pxa Vaibhav Hiremath
2015-07-14 11:34 ` [PATCH-v4 00/11] i2c: pxa: Fixes, cleanup and support for pxa910 family Wolfram Sang
2015-07-14 11:36 ` Vaibhav Hiremath
2015-07-17 19:49 ` Robert Jarzmik
2015-07-20 7:06 ` Vaibhav Hiremath
2015-07-20 7:09 ` Vaibhav Hiremath
2015-07-20 7:12 ` Vaibhav Hiremath
2015-07-20 20:30 ` Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436859410-28878-4-git-send-email-vaibhav.hiremath@linaro.org \
--to=vaibhav.hiremath@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robert.jarzmik@free.fr \
--cc=robh+dt@kernel.org \
--cc=wangshm@marvell.com \
--cc=wsa@the-dreams.de \
--cc=yizhang@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).