Hi Tony, On Sep 18, 2012, at 9:23 PM, Tony Lindgren wrote: > * Pantelis Antoniou <panto@xxxxxxxxxxxxxxxxxxxxxxx> [120918 11:13]: >> Add support for pinctrl mux settings in the OMAP I2C driver. >> If no such pinctl bindings are found a warning message is printed. >> >> Signed-off-by: Pantelis Antoniou <panto@xxxxxxxxxxxxxxxxxxxxxxx> >> >> --- >> drivers/i2c/busses/i2c-omap.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c >> index b149e32..f722478 100644 >> --- a/drivers/i2c/busses/i2c-omap.c >> +++ b/drivers/i2c/busses/i2c-omap.c >> @@ -43,6 +43,8 @@ >> #include <linux/slab.h> >> #include <linux/i2c-omap.h> >> #include <linux/pm_runtime.h> >> +#include <linux/pinctrl/consumer.h> >> +#include <linux/err.h> >> >> /* I2C controller revisions */ >> #define OMAP_I2C_OMAP1_REV_2 0x20 >> @@ -1057,6 +1059,7 @@ omap_i2c_probe(struct platform_device *pdev) >> const struct of_device_id *match; >> int irq; >> int r; >> + struct pinctrl *pinctrl; >> >> /* NOTE: driver uses the static register mapping */ >> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> @@ -1197,6 +1200,10 @@ omap_i2c_probe(struct platform_device *pdev) >> >> of_i2c_register_devices(adap); >> >> + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); >> + if (IS_ERR(pinctrl)) >> + dev_warn(dev->dev, "pins are not configured from the driver\n"); >> + >> pm_runtime_mark_last_busy(dev->dev); >> pm_runtime_put_autosuspend(dev->dev); > > This must be just a warning here as otherwise things will break > badly for drivers doing pinmuxing in bootloader only. Other than > that: > It is just a warning indeed. Not many boards do the pinctrl dance yet. > Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> Regards -- Pantelis -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
