From patchwork Wed Oct 31 15:57:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pantelis Antoniou X-Patchwork-Id: 1672081 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 63F43DFF3D for ; Tue, 30 Oct 2012 18:16:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934130Ab2J3SPl (ORCPT ); Tue, 30 Oct 2012 14:15:41 -0400 Received: from li42-95.members.linode.com ([209.123.162.95]:59053 "EHLO li42-95.members.linode.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934115Ab2J3SMq (ORCPT ); Tue, 30 Oct 2012 14:12:46 -0400 Received: from sles11esa.localdomain (unknown [195.97.110.117]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: panto) by li42-95.members.linode.com (Postfix) with ESMTPSA id 40ABD9C1F6; Tue, 30 Oct 2012 18:04:31 +0000 (UTC) From: Pantelis Antoniou To: Evgeniy Polyakov Cc: Pantelis Antoniou , linux-kernel@vger.kernel.org, Koen Kooi , Matt Porter , Russ Dill , linux-omap@vger.kernel.org Subject: [PATCH] w1-gpio: Pinctrl-fy Date: Wed, 31 Oct 2012 17:57:38 +0200 Message-Id: <1351699058-4576-1-git-send-email-panto@antoniou-consulting.com> X-Mailer: git-send-email 1.7.12 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Enable pinctrl for w1-gpio. Signed-off-by: Pantelis Antoniou Acked-by: Tony Lindgren Acked-by: Evgeniy Polyakov --- 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 #include #include +#include +#include #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;