From: vaibhav.hiremath@linaro.org (Vaibhav Hiremath)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/12] i2c: pxa: Add bus reset functionality
Date: Thu, 28 May 2015 18:33:37 +0530 [thread overview]
Message-ID: <1432818224-17070-6-git-send-email-vaibhav.hiremath@linaro.org> (raw)
In-Reply-To: <1432818224-17070-1-git-send-email-vaibhav.hiremath@linaro.org>
From: Rob Herring <robh@kernel.org>
Since there is some problematic i2c slave devices on some
platforms such as dkb (sometimes), it will drop down sda
and make i2c bus hang, at that time, it need to config
scl/sda into gpio to simulate "stop" sequence to recover
i2c bus, so add this interface.
Signed-off-by: Leilei Shang <shangll@marvell.com>
Signed-off-by: Rob Herring <robh@kernel.org>
[vaibhav.hiremath at linaro.org: Updated Changelog]
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
---
drivers/i2c/busses/i2c-pxa.c | 90 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 8ca5552..eb09071 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -37,6 +37,8 @@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/i2c/pxa-i2c.h>
+#include <linux/of_gpio.h>
+#include <linux/pinctrl/consumer.h>
#include <asm/irq.h>
@@ -177,6 +179,9 @@ struct pxa_i2c {
bool highmode_enter;
unsigned int ilcr;
unsigned int iwcr;
+ struct pinctrl *pinctrl;
+ struct pinctrl_state *pin_i2c;
+ struct pinctrl_state *pin_gpio;
};
#define _IBMR(i2c) ((i2c)->reg_ibmr)
@@ -269,6 +274,62 @@ static void i2c_pxa_show_state(struct pxa_i2c *i2c, int lno, const char *fname)
#define show_state(i2c) i2c_pxa_show_state(i2c, __LINE__, __func__)
+static void i2c_bus_reset(struct pxa_i2c *i2c)
+{
+ int ret, ccnt, pins_scl, pins_sda;
+ struct device *dev = i2c->adap.dev.parent;
+ struct device_node *np = dev->of_node;
+
+ if (!i2c->pinctrl) {
+ dev_warn(dev, "could not do i2c bus reset\n");
+ return;
+ }
+
+ ret = pinctrl_select_state(i2c->pinctrl, i2c->pin_gpio);
+ if (ret) {
+ dev_err(dev, "could not set gpio pins\n");
+ return;
+ }
+
+ pins_scl = of_get_named_gpio(np, "i2c-gpio", 0);
+ if (!gpio_is_valid(pins_scl)) {
+ dev_err(dev, "i2c scl gpio not set\n");
+ goto err_out;
+ }
+ pins_sda = of_get_named_gpio(np, "i2c-gpio", 1);
+ if (!gpio_is_valid(pins_sda)) {
+ dev_err(dev, "i2c sda gpio not set\n");
+ goto err_out;
+ }
+
+ gpio_request(pins_scl, NULL);
+ gpio_request(pins_sda, NULL);
+
+ gpio_direction_input(pins_sda);
+ for (ccnt = 20; ccnt; ccnt--) {
+ gpio_direction_output(pins_scl, ccnt & 0x01);
+ udelay(5);
+ }
+ gpio_direction_output(pins_scl, 0);
+ udelay(5);
+ gpio_direction_output(pins_sda, 0);
+ udelay(5);
+ /* stop signal */
+ gpio_direction_output(pins_scl, 1);
+ udelay(5);
+ gpio_direction_output(pins_sda, 1);
+ udelay(5);
+
+ gpio_free(pins_scl);
+ gpio_free(pins_sda);
+
+err_out:
+ ret = pinctrl_select_state(i2c->pinctrl, i2c->pin_i2c);
+ if (ret)
+ dev_err(dev, "could not set default(i2c) pins\n");
+ return;
+}
+
static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
{
unsigned int i;
@@ -281,6 +342,11 @@ static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
for (i = 0; i < i2c->irqlogidx; i++)
printk("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]);
printk("\n");
+ if (strcmp(why, "exhausted retries") != 0) {
+ i2c_bus_reset(i2c);
+ /* reset i2c contorler when it's fail */
+ i2c_pxa_reset(i2c);
+ }
}
#else /* ifdef DEBUG */
@@ -1301,6 +1367,30 @@ static int i2c_pxa_probe(struct platform_device *dev)
platform_set_drvdata(dev, i2c);
+ i2c->pinctrl = devm_pinctrl_get(&dev->dev);
+ if (IS_ERR(i2c->pinctrl)) {
+ i2c->pinctrl = NULL;
+ dev_warn(&dev->dev, "could not get pinctrl\n");
+ } else {
+ i2c->pin_i2c = pinctrl_lookup_state(i2c->pinctrl, "default");
+ if (IS_ERR(i2c->pin_i2c)) {
+ dev_err(&dev->dev, "could not get default(i2c) pinstate\n");
+ ret = IS_ERR(i2c->pin_i2c);
+ }
+
+ i2c->pin_gpio = pinctrl_lookup_state(i2c->pinctrl, "gpio");
+ if (IS_ERR(i2c->pin_gpio)) {
+ dev_err(&dev->dev, "could not get gpio pinstate\n");
+ ret = IS_ERR(i2c->pin_gpio);
+ }
+
+ if (ret) {
+ i2c->pin_i2c = NULL;
+ i2c->pin_gpio = NULL;
+ i2c->pinctrl = NULL;
+ ret = 0;
+ }
+ }
#ifdef CONFIG_I2C_PXA_SLAVE
printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",
dev_name(&i2c->adap.dev), i2c->slave_addr);
--
1.9.1
next prev parent reply other threads:[~2015-05-28 13:03 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-28 13:03 [PATCH 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 01/12] i2c: pxa: keep i2c irq ON in suspend Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Vaibhav Hiremath
2015-05-29 19:21 ` Robert Jarzmik
2015-05-29 19:25 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 03/12] i2c: pxa: Add reset operation when i2c bus busy Vaibhav Hiremath
2015-05-29 19:39 ` Robert Jarzmik
2015-05-29 20:20 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 04/12] i2c: pxa: Add support for pxa910/988 & new configuration features Vaibhav Hiremath
2015-05-29 20:22 ` Robert Jarzmik
2015-05-29 20:33 ` Vaibhav Hiremath
2015-06-04 2:31 ` Yi Zhang
2015-06-04 5:46 ` Vaibhav Hiremath
2015-06-01 0:13 ` Wolfram Sang
2015-06-02 5:01 ` Vaibhav Hiremath
2015-05-28 13:03 ` Vaibhav Hiremath [this message]
2015-05-29 13:59 ` [PATCH 05/12] i2c: pxa: Add bus reset functionality Rob Herring
2015-05-29 15:40 ` Vaibhav Hiremath
2015-05-29 20:31 ` Robert Jarzmik
2015-06-02 13:12 ` Linus Walleij
2015-06-02 16:40 ` Vaibhav Hiremath
2015-06-03 19:16 ` Vaibhav Hiremath
2015-06-02 17:33 ` Wolfram Sang
2015-06-02 17:40 ` Vaibhav Hiremath
2015-06-02 17:48 ` Wolfram Sang
2015-06-02 17:57 ` Vaibhav Hiremath
2015-06-02 18:02 ` Wolfram Sang
2015-06-02 18:06 ` Vaibhav Hiremath
2015-06-02 18:24 ` Wolfram Sang
2015-06-02 18:46 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 06/12] i2c: pxa: Return I2C_RETRY when timeout in pio mode Vaibhav Hiremath
2015-05-29 20:46 ` Robert Jarzmik
2015-05-29 21:23 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 07/12] i2c: pxa: Reset i2c controller on timeout in interrupt and " Vaibhav Hiremath
2015-05-29 21:13 ` Robert Jarzmik
2015-05-29 21:19 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 08/12] i2c: pxa: enable/disable irq across message xfer Vaibhav Hiremath
2015-05-28 13:17 ` Russell King - ARM Linux
2015-05-28 13:29 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 09/12] i2c: pxa: Remove compile warnning in 64bit mode Vaibhav Hiremath
2015-05-29 21:28 ` Robert Jarzmik
2015-05-28 13:03 ` [PATCH 10/12] i2c: pxa: Update debug function to dump more info on error Vaibhav Hiremath
2015-05-29 21:42 ` Robert Jarzmik
2015-05-29 21:45 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 11/12] i2c:pxa: Use devm_ variants in probe function Vaibhav Hiremath
2015-05-30 15:53 ` Robert Jarzmik
2015-05-31 7:36 ` Vaibhav Hiremath
2015-05-28 13:03 ` [PATCH 12/12] i2c: pxa: enable/disable i2c module across msg xfer Vaibhav Hiremath
2015-05-28 13:23 ` Russell King - ARM Linux
2015-06-02 16:52 ` Vaibhav Hiremath
2015-06-02 16:59 ` Vaibhav Hiremath
2015-06-03 10:56 ` Yi Zhang
2015-06-03 18:49 ` Vaibhav Hiremath
2015-06-04 6:29 ` Yi Zhang
2015-06-04 7:19 ` Vaibhav Hiremath
2015-06-04 7:58 ` Yi Zhang
2015-06-01 0:07 ` [PATCH 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Wolfram Sang
2015-06-02 4:58 ` Vaibhav Hiremath
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=1432818224-17070-6-git-send-email-vaibhav.hiremath@linaro.org \
--to=vaibhav.hiremath@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).