From patchwork Wed Jan 16 09:48:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Fuzzey X-Patchwork-Id: 1987291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 94E843FDD1 for ; Wed, 16 Jan 2013 09:52:17 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TvPce-0003ga-Gu; Wed, 16 Jan 2013 09:49:28 +0000 Received: from mta1.parkeon.com ([91.121.43.66]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TvPbv-0003ZJ-Kv for linux-arm-kernel@lists.infradead.org; Wed, 16 Jan 2013 09:48:45 +0000 Received: from mta2.parkeon.com ([81.80.172.220]) by mta1.parkeon.com with esmtp (Exim 4.76) (envelope-from ) id 1TvPbh-00073p-Td; Wed, 16 Jan 2013 10:48:30 +0100 Received: from [10.32.16.23] (helo=mail.besancon.parkeon.com) by mta2.parkeon.com with esmtp (Exim 4.77) (envelope-from ) id 1TvPbf-0006WW-Lo; Wed, 16 Jan 2013 10:48:27 +0100 Received: from [10.32.51.221] (port=41461 helo=[127.0.0.1]) by mail.besancon.parkeon.com with esmtp (Exim 4.71) (envelope-from ) id 1TvPbh-0000B5-PA; Wed, 16 Jan 2013 10:48:29 +0100 Subject: [PATCH 4/5] W1: Add pinctrl support to MXC onewire master. To: Evgeniy Polyakov , Sascha Hauer , linux-arm-kernel@lists.infradead.org From: Martin Fuzzey Date: Wed, 16 Jan 2013 10:48:29 +0100 Message-ID: <20130116094829.9660.49196.stgit@localhost> In-Reply-To: <20130116094821.9660.18278.stgit@localhost> References: <20130116094821.9660.18278.stgit@localhost> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Virus-Scanned: by ClamAV at mta2.parkeon.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130116_044843_929019_848196A3 X-CRM114-Status: GOOD ( 10.30 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Martin Fuzzey --- drivers/w1/masters/mxc_w1.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 949e566..7454938 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "../w1.h" #include "../w1_int.h" @@ -107,6 +108,7 @@ static int mxc_w1_probe(struct platform_device *pdev) { struct mxc_w1_device *mdev; struct resource *res; + struct pinctrl *pinctrl; int err = 0; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -117,6 +119,13 @@ static int mxc_w1_probe(struct platform_device *pdev) if (!mdev) return -ENOMEM; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + err = PTR_ERR(pinctrl); + dev_err(&pdev->dev, "failed to get default pinctrl: %d\n", err); + goto failed_pin; + } + mdev->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(mdev->clk)) { err = PTR_ERR(mdev->clk); @@ -159,6 +168,7 @@ failed_ioremap: release_mem_region(res->start, resource_size(res)); failed_req: clk_put(mdev->clk); +failed_pin: failed_clk: kfree(mdev); return err;