Skip to content

Commit

Permalink
w1-gpio: Pinctrl-fy
Browse files Browse the repository at this point in the history
Enable pinctrl for w1-gpio.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Pantelis Antoniou authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 5f7e222 commit 277ed0d
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/w1/masters/w1-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 277ed0d

Please sign in to comment.