Skip to contentSkip to conversation

i2c: designware: add pinctrl for recovery info as an option

PATCH In review Hanna Hawa 2 participants 3 messages Dec 14, 2022

Subsystems (3)
lore
Share & tools
lore

Hanna Hawa

author
#0 lore raw

PATCH 1/1 i2c: designware: add pinctrl for recovery info as an option

The current implementation of designware recovery mechanism fit for specific device (Intel / Altera Cyclone V SOC) which have two separated "wired" GPIOs to the i2c bus via the SOC FPGA for the i2c recovery.

This change add ability to get the pinctrl for the i2c recovery in order to switch between pin configuration (I2C and GPIO functionality) if the pinctrl exists.

---
 drivers/i2c/busses/i2c-designware-master.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/i2c/busses/i2c-designware-master.c +9 -0
index dc3c5a15a95b..478318b1d35f 100644
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
@@ -832,6 +833,14 @@ static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev)
 	struct i2c_adapter *adap = &dev->adapter;
 	struct gpio_desc *gpio;
 
+	rinfo->pinctrl = devm_pinctrl_get(dev->dev);
+	if (IS_ERR(rinfo->pinctrl)) {
+		if (PTR_ERR(rinfo->pinctrl) == -EPROBE_DEFER)
+			return -EPROBE_DEFER;
+		rinfo->pinctrl = NULL;
+		dev_dbg(dev->dev, "can't get pinctrl for i2c recovery\n");
+	}
+
 	gpio = devm_gpiod_get_optional(dev->dev, "scl", GPIOD_OUT_HIGH);
 	if (IS_ERR_OR_NULL(gpio))
 		return PTR_ERR_OR_ZERO(gpio);
Signature · 1 line
2.38.1
#1 lore raw
Quoted 7 lines · Hanna Hawa

The current implementation of designware recovery mechanism fit for specific device (Intel / Altera Cyclone V SOC) which have two separated "wired" GPIOs to the i2c bus via the SOC FPGA for the i2c recovery.

This change add ability to get the pinctrl for the i2c recovery in order to switch between pin configuration (I2C and GPIO functionality) if the pinctrl exists.

...

drivers/i2c/busses/i2c-designware-master.c static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev) · line 842

Quoted 7 lines
drivers/i2c/busses/i2c-designware-master.c +7 -0
+	rinfo->pinctrl = devm_pinctrl_get(dev->dev);
+	if (IS_ERR(rinfo->pinctrl)) {
+		if (PTR_ERR(rinfo->pinctrl) == -EPROBE_DEFER)
+			return -EPROBE_DEFER;
+		rinfo->pinctrl = NULL;
+		dev_dbg(dev->dev, "can't get pinctrl for i2c recovery\n");
+	}

Can you explain, why pinctrl_bind_pins() is not enough?

(You may also refer to the ab78029ecc34 ("drivers/pinctrl: grab default handles
from device core") for more details.)

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 4 lines · Andy Shevchenko

Can you explain, why pinctrl_bind_pins() is not enough?

(You may also refer to the ab78029ecc34 ("drivers/pinctrl: grab default handles
from device core") for more details.)

Thanks for your reviewing and pointing to this function.

No need to recall the devm_pinctrl_get() during the i2c probe, as the pinctrl_bind_pins() is enough to init the pinctrl struct. But still need to set the rinfo->pinctrl with dev->pins->p, will upload new patchset.

The change will look like:

@@ -832,6 +833,9 @@ static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev)

        struct i2c_adapter *adap = &dev->adapter;
        struct gpio_desc *gpio;

+ if (dev->dev->pins && dev->dev->pins->p)
+ rinfo->pinctrl = dev->dev->pins->p;
+

        gpio = devm_gpiod_get_optional(dev->dev, "scl", GPIOD_OUT_HIGH);
        if (IS_ERR_OR_NULL(gpio))
                return PTR_ERR_OR_ZERO(gpio);

Thanks,
Hanna