2022-12-21 21:05:14

by Hanna Hawa

Subject: [PATCH v4 2/2] i2c: Set i2c pinctrl recovery info from it's device pinctrl

Currently the i2c subsystem rely on the controller device tree to
initialize the pinctrl recovery information, part of the drivers does
not set this field (rinfo->pinctrl), for example i2c designware driver.

The pins information is saved part of the device structure before probe
and it's done on pinctrl_bind_pins().

Make the i2c init recovery to get the device pins if it's not
initialized by the driver from the device pins.

Signed-off-by: Hanna Hawa <[email protected]>
---
drivers/i2c/i2c-core-base.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 7539b0740351..8c5f76c43dc8 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -34,6 +34,7 @@
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/pinctrl/consumer.h>
+#include <linux/pinctrl/devinfo.h>
#include <linux/pm_domain.h>
#include <linux/pm_runtime.h>
#include <linux/pm_wakeirq.h>
@@ -282,7 +283,10 @@ static void i2c_gpio_init_pinctrl_recovery(struct i2c_adapter *adap)
{
struct i2c_bus_recovery_info *bri = adap->bus_recovery_info;
struct device *dev = &adap->dev;
- struct pinctrl *p = bri->pinctrl;
+ struct pinctrl *p;
+
+ bri->pinctrl = bri->pinctrl ?: dev_pinctrl(dev->parent);
+ p = bri->pinctrl;

/*
* we can't change states without pinctrl, so remove the states if
--
2.38.1

2022-12-28 15:29:02

by Andy Shevchenko

Subject: Re: [PATCH v4 2/2] i2c: Set i2c pinctrl recovery info from it's device pinctrl

On Wed, Dec 21, 2022 at 08:51:16PM +0000, Hanna Hawa wrote:
> Currently the i2c subsystem rely on the controller device tree to
> initialize the pinctrl recovery information, part of the drivers does
> not set this field (rinfo->pinctrl), for example i2c designware driver.

DesignWare

> The pins information is saved part of the device structure before probe
> and it's done on pinctrl_bind_pins().
>
> Make the i2c init recovery to get the device pins if it's not
> initialized by the driver from the device pins.

...

> - struct pinctrl *p = bri->pinctrl;
> + struct pinctrl *p;
> +
> + bri->pinctrl = bri->pinctrl ?: dev_pinctrl(dev->parent);
> + p = bri->pinctrl;

What about

struct pinctrl *p = bri->pinctrl ?: dev_pinctrl(dev->parent);

bri->pinctrl = p;

?

Seems like one line of code less.

Either way,
Reviewed-by: Andy Shevchenko <[email protected]>

--
With Best Regards,
Andy Shevchenko