luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

w1-gpio: Pinctrl-fy

Browse Source 
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>
This commit is contained in:
Pantelis Antoniou 2012-11-22 01:13:29 +04:00 committed by Greg Kroah-Hartman
parent 5f7e22283c
commit 277ed0d542
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/w1/masters/w1-gpio.c
View File

@ -16,6 +16,8 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/pinctrl/consumer.h>
#include <linux/err.h>
#include "../w1.h" #include "../w1.h"
#include "../w1_int.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_bus_master *master;
struct w1_gpio_platform_data *pdata; struct w1_gpio_platform_data *pdata;
struct pinctrl *pinctrl;
int err; 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); err = w1_gpio_probe_dt(pdev);
if (err < 0) if (err < 0)
return err; return err;