Commit 20cb3fce authored by Hanna Hawa's avatar Hanna Hawa Committed by Wolfram Sang
Browse files

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: default avatarHanna Hawa <hhhawa@amazon.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 13e80244

drivers/i2c/i2c-core-base.c

+4 −1
Original line number Diff line number Diff line
@@ -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