[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1351699058-4576-1-git-send-email-panto@antoniou-consulting.com>
Date: Wed, 31 Oct 2012 17:57:38 +0200
From: Pantelis Antoniou <panto@...oniou-consulting.com>
To: Evgeniy Polyakov <zbr@...emap.net>
Cc: Pantelis Antoniou <panto@...oniou-consulting.com>,
linux-kernel@...r.kernel.org,
Koen Kooi <koen@...inion.thruhere.net>,
Matt Porter <mporter@...com>, Russ Dill <Russ.Dill@...com>,
linux-omap@...r.kernel.org
Subject: [PATCH] w1-gpio: Pinctrl-fy
Enable pinctrl for w1-gpio.
Signed-off-by: Pantelis Antoniou <panto@...oniou-consulting.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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists