From: vaibhav.hiremath@linaro.org (Vaibhav Hiremath) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH-RESEND 3/3] i2c: pxa: Add pin ctrl support for CP core access Date: Wed, 3 Jun 2015 00:15:31 +0530 [thread overview] Message-ID: <1433270731-23790-4-git-send-email-vaibhav.hiremath@linaro.org> (raw) In-Reply-To: <1433270731-23790-1-git-send-email-vaibhav.hiremath@linaro.org> PMIC TWSI pins configuration for AP and CP is different on eden, it need to be set to function 0 when AP get RIPC lock. When AP release RIPC lock, it also need configure twsi pins to other state, otherwise pinctrl will assume pins configration is not changed even if it is changed by CP, so it will not change twsi pins configuration to AP state when AP get RIPC next time. Signed-off-by: Shouming Wang <wangshm@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org> --- drivers/i2c/busses/i2c-pxa.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index eb26eb1..1340de1 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -184,6 +184,7 @@ struct pxa_i2c { struct pinctrl *pinctrl; struct pinctrl_state *pin_i2c; struct pinctrl_state *pin_gpio; + struct pinctrl_state *pin_i2c_cp; }; #define _IBMR(i2c) ((i2c)->reg_ibmr) @@ -405,6 +406,10 @@ void mmp_hwlock_lock(struct i2c_adapter *adap) ripc_status = true; spin_unlock_irqrestore(&lock_for_ripc, flags); + + if (pinctrl_select_state(i2c->pinctrl, i2c->pin_i2c) < 0) + dev_err(&i2c->adap.dev, "could not set i2c AP pins\n"); + } void mmp_hwlock_unlock(struct i2c_adapter *adap) @@ -413,6 +418,9 @@ void mmp_hwlock_unlock(struct i2c_adapter *adap) struct pxa_i2c *i2c = adap->algo_data; + if (pinctrl_select_state(i2c->pinctrl, i2c->pin_i2c_cp) < 0) + dev_err(&i2c->adap.dev, "could not set i2c CP pins\n"); + spin_lock_irqsave(&lock_for_ripc, flags); __raw_writel(1, i2c->hwlock_addr); ripc_status = false; @@ -430,6 +438,9 @@ int mmp_hwlock_trylock(struct i2c_adapter *adap) ripc_status = !__raw_readl(i2c->hwlock_addr); spin_unlock_irqrestore(&lock_for_ripc, flags); + if (ripc_status && (pinctrl_select_state(i2c->pinctrl, i2c->pin_i2c) < 0)) + dev_err(&i2c->adap.dev, "could not set i2c AP pins\n"); + return ripc_status; } @@ -1497,8 +1508,14 @@ static int i2c_pxa_probe(struct platform_device *dev) ret = IS_ERR(i2c->pin_gpio); } + /* pin ctrl for CP - optional */ + i2c->pin_i2c_cp = pinctrl_lookup_state(i2c->pinctrl, "i2c_cp"); + if (IS_ERR(i2c->pin_i2c_cp)) + dev_err(&dev->dev, "could not get i2c_cp pinstate\n"); + if (ret) { i2c->pin_i2c = NULL; + i2c->pin_i2c_cp = NULL; i2c->pin_gpio = NULL; i2c->pinctrl = NULL; ret = 0; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org, Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Shouming Wang <wangshm-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Haojian Zhuang <haojian.zhuang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Subject: [PATCH-RESEND 3/3] i2c: pxa: Add pin ctrl support for CP core access Date: Wed, 3 Jun 2015 00:15:31 +0530 [thread overview] Message-ID: <1433270731-23790-4-git-send-email-vaibhav.hiremath@linaro.org> (raw) In-Reply-To: <1433270731-23790-1-git-send-email-vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> PMIC TWSI pins configuration for AP and CP is different on eden, it need to be set to function 0 when AP get RIPC lock. When AP release RIPC lock, it also need configure twsi pins to other state, otherwise pinctrl will assume pins configration is not changed even if it is changed by CP, so it will not change twsi pins configuration to AP state when AP get RIPC next time. Signed-off-by: Shouming Wang <wangshm-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Haojian Zhuang <haojian.zhuang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> --- drivers/i2c/busses/i2c-pxa.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index eb26eb1..1340de1 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -184,6 +184,7 @@ struct pxa_i2c { struct pinctrl *pinctrl; struct pinctrl_state *pin_i2c; struct pinctrl_state *pin_gpio; + struct pinctrl_state *pin_i2c_cp; }; #define _IBMR(i2c) ((i2c)->reg_ibmr) @@ -405,6 +406,10 @@ void mmp_hwlock_lock(struct i2c_adapter *adap) ripc_status = true; spin_unlock_irqrestore(&lock_for_ripc, flags); + + if (pinctrl_select_state(i2c->pinctrl, i2c->pin_i2c) < 0) + dev_err(&i2c->adap.dev, "could not set i2c AP pins\n"); + } void mmp_hwlock_unlock(struct i2c_adapter *adap) @@ -413,6 +418,9 @@ void mmp_hwlock_unlock(struct i2c_adapter *adap) struct pxa_i2c *i2c = adap->algo_data; + if (pinctrl_select_state(i2c->pinctrl, i2c->pin_i2c_cp) < 0) + dev_err(&i2c->adap.dev, "could not set i2c CP pins\n"); + spin_lock_irqsave(&lock_for_ripc, flags); __raw_writel(1, i2c->hwlock_addr); ripc_status = false; @@ -430,6 +438,9 @@ int mmp_hwlock_trylock(struct i2c_adapter *adap) ripc_status = !__raw_readl(i2c->hwlock_addr); spin_unlock_irqrestore(&lock_for_ripc, flags); + if (ripc_status && (pinctrl_select_state(i2c->pinctrl, i2c->pin_i2c) < 0)) + dev_err(&i2c->adap.dev, "could not set i2c AP pins\n"); + return ripc_status; } @@ -1497,8 +1508,14 @@ static int i2c_pxa_probe(struct platform_device *dev) ret = IS_ERR(i2c->pin_gpio); } + /* pin ctrl for CP - optional */ + i2c->pin_i2c_cp = pinctrl_lookup_state(i2c->pinctrl, "i2c_cp"); + if (IS_ERR(i2c->pin_i2c_cp)) + dev_err(&dev->dev, "could not get i2c_cp pinstate\n"); + if (ret) { i2c->pin_i2c = NULL; + i2c->pin_i2c_cp = NULL; i2c->pin_gpio = NULL; i2c->pinctrl = NULL; ret = 0; -- 1.9.1
next prev parent reply other threads:[~2015-06-02 18:45 UTC|newest] Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <vaibhav.hiremath@linaro.org> 2015-06-02 18:45 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath 2015-06-02 18:45 ` [PATCH-RESEND 1/3] i2c: core: append hardware lock with bus lock Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath 2015-06-02 18:45 ` [PATCH-RESEND 2/3] i2c: pxa: Add support for hardware lock Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath 2015-06-02 18:45 ` Vaibhav Hiremath [this message] 2015-06-02 18:45 ` [PATCH-RESEND 3/3] i2c: pxa: Add pin ctrl support for CP core access Vaibhav Hiremath 2015-06-16 8:28 ` [PATCH-RESEND 0/3] i2c: core/pxa: Add support for hardware lock Vaibhav Hiremath 2015-06-16 8:28 ` Vaibhav Hiremath 2015-07-07 6:43 ` Vaibhav Hiremath 2015-07-07 6:43 ` Vaibhav Hiremath 2015-10-25 9:52 ` Wolfram Sang 2015-10-25 9:52 ` Wolfram Sang 2015-06-15 15:49 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 01/12] i2c: pxa: keep i2c irq ON in suspend Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 20:58 ` Robert Jarzmik 2015-07-03 20:58 ` Robert Jarzmik 2015-06-15 15:49 ` [PATCH-V2 03/12] i2c: pxa: Return I2C_RETRY when timeout in pio mode Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-16 5:31 ` Shubhrajyoti Datta 2015-06-16 5:31 ` Shubhrajyoti Datta 2015-06-16 7:41 ` Vaibhav Hiremath 2015-06-16 7:41 ` Vaibhav Hiremath 2015-07-03 21:07 ` Robert Jarzmik 2015-07-03 21:07 ` Robert Jarzmik 2015-06-15 15:49 ` [PATCH-V2 04/12] i2c: pxa: Reset i2c controller on timeout in interrupt and " Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 15:27 ` Robert Jarzmik 2015-07-03 15:27 ` Robert Jarzmik 2015-07-03 18:13 ` Vaibhav Hiremath 2015-07-03 18:13 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 05/12] i2c: pxa: Remove compile warnning in 64bit mode Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 06/12] i2c: pxa: Update debug function to dump more info on error Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 07/12] i2c:pxa: Use devm_ variants in probe function Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 18:14 ` Vaibhav Hiremath 2015-07-03 18:14 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 08/12] i2c: pxa: enable/disable i2c module across msg xfer Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 18:23 ` Vaibhav Hiremath 2015-07-03 18:23 ` Vaibhav Hiremath 2015-07-03 18:48 ` Vaibhav Hiremath 2015-07-03 18:48 ` Vaibhav Hiremath 2015-07-03 19:44 ` Robert Jarzmik 2015-07-03 19:44 ` Robert Jarzmik 2015-06-15 15:49 ` [PATCH-V2 09/12] Documentation: binding: add new property 'disable_after_xfer' to i2c-pxa Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 10/12] i2c: pxa: Add support for pxa910/988 & new configuration features Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 11/12] i2c: pxa: Add ILCR (tLow & tHigh) configuration support Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 15:28 ` Robert Jarzmik 2015-07-03 18:17 ` Vaibhav Hiremath 2015-07-03 18:17 ` Vaibhav Hiremath 2015-06-15 15:49 ` [PATCH-V2 12/12] Documentation: binding: add sclk adjustment properties to i2c-pxa Vaibhav Hiremath 2015-06-15 15:49 ` Vaibhav Hiremath 2015-06-16 13:22 ` Rob Herring 2015-06-16 13:22 ` Rob Herring 2015-06-16 14:25 ` Vaibhav Hiremath 2015-06-16 14:25 ` Vaibhav Hiremath 2015-06-29 8:52 ` [PATCH-V2 00/12] i2c: pxa: Fixes, cleanup and support for pxa910 family Vaibhav Hiremath 2015-06-29 8:52 ` Vaibhav Hiremath 2015-07-02 16:54 ` Vaibhav Hiremath 2015-07-02 16:54 ` Vaibhav Hiremath 2015-06-17 18:58 [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2 1/3] mfd: 88pm800: Add device " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2] rtc: 88pm80x: add " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-20 0:43 ` Alexandre Belloni 2015-06-20 0:43 ` Alexandre Belloni 2015-06-20 0:43 ` Alexandre Belloni 2015-06-20 0:43 ` Alexandre Belloni 2015-06-25 7:46 ` Vaibhav Hiremath 2015-06-25 7:46 ` Vaibhav Hiremath 2015-06-25 7:46 ` Vaibhav Hiremath 2015-06-25 7:46 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-07-07 6:37 ` Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2 2/3] mfd: 88pm800: Allow configuration of interrupt clear method Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [PATCH-v2 3/3] mfd: devicetree: bindings: Add new 88pm800 mfd binding Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-17 18:58 ` [rtc-linux] " Vaibhav Hiremath 2015-06-17 18:58 ` Vaibhav Hiremath 2015-06-23 15:37 ` Rob Herring 2015-06-23 15:37 ` Rob Herring 2015-06-23 15:37 ` [rtc-linux] " Rob Herring 2015-06-23 15:37 ` Rob Herring 2015-06-23 17:02 ` Vaibhav Hiremath 2015-06-23 17:02 ` Vaibhav Hiremath 2015-06-23 17:02 ` [rtc-linux] " Vaibhav Hiremath 2015-06-24 0:29 ` Krzysztof Kozlowski 2015-06-24 0:29 ` Krzysztof Kozlowski 2015-06-24 0:29 ` [rtc-linux] " Krzysztof Kozlowski 2015-06-24 0:29 ` Krzysztof Kozlowski 2015-06-24 5:19 ` Vaibhav Hiremath 2015-06-24 5:19 ` Vaibhav Hiremath 2015-06-24 5:19 ` [rtc-linux] " Vaibhav Hiremath 2015-06-24 5:19 ` Vaibhav Hiremath 2015-06-23 5:07 ` [PATCH-v2 0/3] mfd: 88pm800: Add Device tree support Vaibhav Hiremath 2015-06-23 5:07 ` Vaibhav Hiremath 2015-06-23 5:07 ` [rtc-linux] " Vaibhav Hiremath 2015-06-23 5:07 ` 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=1433270731-23790-4-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.