linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] i2c: pxa: don't error out if there's no pinctrl
@ 2020-06-02 19:38 Lubomir Rintel
  2020-06-03 20:38 ` Wolfram Sang
  0 siblings, 1 reply; 2+ messages in thread
From: Lubomir Rintel @ 2020-06-02 19:38 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: Russell King, Andrew Lunn, linux-i2c, linux-kernel, Lubomir Rintel

The bus recovery patch regresses on OLPC XO-1.75 that has no pinctrl in
its DT.

Fixes: 7c9ec2c52518 ("i2c: pxa: implement generic i2c bus recovery")'
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 drivers/i2c/busses/i2c-pxa.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index a7885b8b5031c..35ca2c02c9b9b 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1348,6 +1348,8 @@ static int i2c_pxa_init_recovery(struct pxa_i2c *i2c)
 		return 0;
 
 	i2c->pinctrl = devm_pinctrl_get(dev);
+	if (PTR_ERR(i2c->pinctrl) == -ENODEV)
+		i2c->pinctrl = NULL;
 	if (IS_ERR(i2c->pinctrl))
 		return PTR_ERR(i2c->pinctrl);
 
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] i2c: pxa: don't error out if there's no pinctrl
  2020-06-02 19:38 [PATCH] i2c: pxa: don't error out if there's no pinctrl Lubomir Rintel
@ 2020-06-03 20:38 ` Wolfram Sang
  0 siblings, 0 replies; 2+ messages in thread
From: Wolfram Sang @ 2020-06-03 20:38 UTC (permalink / raw)
  To: Lubomir Rintel; +Cc: Russell King, Andrew Lunn, linux-i2c, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

On Tue, Jun 02, 2020 at 09:38:23PM +0200, Lubomir Rintel wrote:
> The bus recovery patch regresses on OLPC XO-1.75 that has no pinctrl in
> its DT.
> 
> Fixes: 7c9ec2c52518 ("i2c: pxa: implement generic i2c bus recovery")'
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>

Applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-06-03 20:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-02 19:38 [PATCH] i2c: pxa: don't error out if there's no pinctrl Lubomir Rintel
2020-06-03 20:38 ` Wolfram Sang

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).