linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] i2c: cadence: make bus recovery optional
@ 2022-10-23 21:51 Michael Grzeschik
  2022-11-14 15:57 ` Michael Grzeschik
  0 siblings, 1 reply; 6+ messages in thread
From: Michael Grzeschik @ 2022-10-23 21:51 UTC (permalink / raw)
  To: linux-i2c; +Cc: michal.simek, linux-arm-kernel, kernel

There is no need for the i2c driver to have functional bus recovery to
probe successfully. We patch this by only adding bus_recovery_info only
if we get usable pinctrl data.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 drivers/i2c/busses/i2c-cadence.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
index fe0cd205502de9..cf212b8ffd56af 100644
--- a/drivers/i2c/busses/i2c-cadence.c
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -1262,10 +1262,10 @@ static int cdns_i2c_probe(struct platform_device *pdev)
 	}
 
 	id->rinfo.pinctrl = devm_pinctrl_get(&pdev->dev);
-	if (IS_ERR(id->rinfo.pinctrl)) {
+	if (!IS_ERR(id->rinfo.pinctrl))
+		id->adap.bus_recovery_info = &id->rinfo;
+	else
 		dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n");
-		return PTR_ERR(id->rinfo.pinctrl);
-	}
 
 	id->membase = devm_platform_get_and_ioremap_resource(pdev, 0, &r_mem);
 	if (IS_ERR(id->membase))
@@ -1283,7 +1283,6 @@ static int cdns_i2c_probe(struct platform_device *pdev)
 	id->adap.retries = 3;		/* Default retry value. */
 	id->adap.algo_data = id;
 	id->adap.dev.parent = &pdev->dev;
-	id->adap.bus_recovery_info = &id->rinfo;
 	init_completion(&id->xfer_done);
 	snprintf(id->adap.name, sizeof(id->adap.name),
 		 "Cadence I2C at %08lx", (unsigned long)r_mem->start);
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

end of thread, other threads:[~2022-12-01 23:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-23 21:51 [PATCH] i2c: cadence: make bus recovery optional Michael Grzeschik
2022-11-14 15:57 ` Michael Grzeschik
2022-11-28 11:58   ` Michael Riesch
2022-11-28 13:07     ` Michael Grzeschik
2022-11-28 13:24       ` Michael Grzeschik
2022-12-01 22:54         ` 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).