| Message ID | 1351699058-4576-1-git-send-email-panto@antoniou-consulting.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Pantelis Antoniou <panto@antoniou-consulting.com> [121030 11:17]: > Enable pinctrl for w1-gpio. > > Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Acked-by: Tony Lindgren <tony@atomide.com> > --- > drivers/w1/masters/w1-gpio.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c > index 6012c4e..aec35bd 100644 > --- a/drivers/w1/masters/w1-gpio.c > +++ b/drivers/w1/masters/w1-gpio.c > @@ -16,6 +16,8 @@ > #include <linux/gpio.h> > #include <linux/of_platform.h> > #include <linux/of_gpio.h> > +#include <linux/pinctrl/consumer.h> > +#include <linux/err.h> > > #include "../w1.h" > #include "../w1_int.h" > @@ -85,8 +87,13 @@ static int __init w1_gpio_probe(struct platform_device *pdev) > { > struct w1_bus_master *master; > struct w1_gpio_platform_data *pdata; > + struct pinctrl *pinctrl; > int err; > > + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); > + if (IS_ERR(pinctrl)) > + dev_warn(&pdev->dev, "unable to select pin group\n"); > + > err = w1_gpio_probe_dt(pdev); > if (err < 0) > return err; > -- > 1.7.12 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi On Tue, Oct 30, 2012 at 11:26:25AM -0700, Tony Lindgren (tony@atomide.com) wrote: > * Pantelis Antoniou <panto@antoniou-consulting.com> [121030 11:17]: > > Enable pinctrl for w1-gpio. > > > > Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> > > Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Please submit patches through the appropriate tree, or you want me to push them upstream?
* Evgeniy Polyakov <zbr@ioremap.net> [121105 07:47]: > Hi > > On Tue, Oct 30, 2012 at 11:26:25AM -0700, Tony Lindgren (tony@atomide.com) wrote: > > * Pantelis Antoniou <panto@antoniou-consulting.com> [121030 11:17]: > > > Enable pinctrl for w1-gpio. > > > > > > Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> > > > > Acked-by: Tony Lindgren <tony@atomide.com> > > Acked-by: Evgeniy Polyakov <zbr@ioremap.net> > > Please submit patches through the appropriate tree, or you want me to > push them upstream? I prefer you queue it. Thanks, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index 6012c4e..aec35bd 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -16,6 +16,8 @@ #include <linux/gpio.h> #include <linux/of_platform.h> #include <linux/of_gpio.h> +#include <linux/pinctrl/consumer.h> +#include <linux/err.h> #include "../w1.h" #include "../w1_int.h" @@ -85,8 +87,13 @@ static int __init w1_gpio_probe(struct platform_device *pdev) { struct w1_bus_master *master; struct w1_gpio_platform_data *pdata; + struct pinctrl *pinctrl; int err; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + dev_warn(&pdev->dev, "unable to select pin group\n"); + err = w1_gpio_probe_dt(pdev); if (err < 0) return err;
Enable pinctrl for w1-gpio. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> --- drivers/w1/masters/w1-gpio.c | 7 +++++++ 1 file changed, 7 insertions(+)