diff options
author | Hanna Hawa <hhhawa@amazon.com> | 2022-12-28 16:48:13 +0000 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2023-01-20 09:52:34 +0100 |
commit | 20cb3fce4d60deb5067380ff0e934b52c35749a6 (patch) | |
tree | f172ff19bf7bc825ead581dc76b7590cee511363 /drivers/i2c/i2c-core-base.c | |
parent | 13e80244ca7e51d5eb7803f05e0579b11fc89048 (diff) | |
download | linux-20cb3fce4d60deb5067380ff0e934b52c35749a6.tar.gz linux-20cb3fce4d60deb5067380ff0e934b52c35749a6.tar.bz2 linux-20cb3fce4d60deb5067380ff0e934b52c35749a6.zip |
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 <hhhawa@amazon.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c/i2c-core-base.c')
-rw-r--r-- | drivers/i2c/i2c-core-base.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index b47e255fc6f1..4a72b98aca21 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,9 @@ 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 ?: dev_pinctrl(dev->parent); + + bri->pinctrl = p; /* * we can't change states without pinctrl, so remove the states if |