2012-10-30 18:15:42

by Pantelis Antoniou

Subject: [PATCH] w1-gpio: Pinctrl-fy

Enable pinctrl for w1-gpio.

Signed-off-by: Pantelis Antoniou <[email protected]>
---
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

2012-10-30 18:26:32

by Tony Lindgren

Subject: Re: [PATCH] w1-gpio: Pinctrl-fy

* Pantelis Antoniou <[email protected]> [121030 11:17]:
> Enable pinctrl for w1-gpio.
>
> Signed-off-by: Pantelis Antoniou <[email protected]>

Acked-by: Tony Lindgren <[email protected]>

> ---
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2012-11-05 15:45:30

by Evgeniy Polyakov

Subject: Re: [PATCH] w1-gpio: Pinctrl-fy

Hi

On Tue, Oct 30, 2012 at 11:26:25AM -0700, Tony Lindgren ([email protected]) wrote:
> * Pantelis Antoniou <[email protected]> [121030 11:17]:
> > Enable pinctrl for w1-gpio.
> >
> > Signed-off-by: Pantelis Antoniou <[email protected]>
>
> Acked-by: Tony Lindgren <[email protected]>

Acked-by: Evgeniy Polyakov <[email protected]>

Please submit patches through the appropriate tree, or you want me to
push them upstream?

--
Evgeniy Polyakov

2012-11-05 16:14:40

by Tony Lindgren

Subject: Re: [PATCH] w1-gpio: Pinctrl-fy

* Evgeniy Polyakov <[email protected]> [121105 07:47]:
> Hi
>
> On Tue, Oct 30, 2012 at 11:26:25AM -0700, Tony Lindgren ([email protected]) wrote:
> > * Pantelis Antoniou <[email protected]> [121030 11:17]:
> > > Enable pinctrl for w1-gpio.
> > >
> > > Signed-off-by: Pantelis Antoniou <[email protected]>
> >
> > Acked-by: Tony Lindgren <[email protected]>
>
> Acked-by: Evgeniy Polyakov <[email protected]>
>
> Please submit patches through the appropriate tree, or you want me to
> push them upstream?

I prefer you queue it.

Thanks,

Tony