From patchwork Tue Aug 20 16:16:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2847183 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AC184BF546 for ; Tue, 20 Aug 2013 16:17:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A866D20511 for ; Tue, 20 Aug 2013 16:17:14 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6242B204D6 for ; Tue, 20 Aug 2013 16:17:13 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBocI-0002qp-1S; Tue, 20 Aug 2013 16:17:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBocF-0000ls-Pi; Tue, 20 Aug 2013 16:17:07 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VBoc7-0000k5-3E for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2013 16:17:00 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRU00IWK7VFGVC0@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2013 17:16:35 +0100 (BST) X-AuditID: cbfec7f4-b7f5f6d000000ff6-ed-52139663c7f3 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id DF.54.04086.36693125; Tue, 20 Aug 2013 17:16:35 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MRU00L9P7VKI260@eusync2.samsung.com>; Tue, 20 Aug 2013 17:16:35 +0100 (BST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] pinctrl: samsung: Parse pin groups before calling pinctrl_register() Date: Tue, 20 Aug 2013 18:16:21 +0200 Message-id: <1377015381-26455-1-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.3.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBJMWRmVeSWpSXmKPExsVy+t/xK7rJ04SDDDo/ylv0LrjKZnG26Q27 xZQ/y5ksNj2+xmox4/w+Jov1M16zWBybsYTRgd3jzrU9bB6bl9R79G1ZxejxeZNcAEsUl01K ak5mWWqRvl0CV8aio1uYC+ZzV/S+fcPSwLids4uRk0NCwESi68F3ZghbTOLCvfVsXYxcHEIC SxklTu7ZyAzh9DFJ3D39khWkik1ATeJzwyM2EFtEQENiStdjdhCbWeATo0T/u0AQW1ggXOLd 3qdg9SwCqhKfLr5lAbF5BZwk3u+4zgSxTUFi2Ze1zBMYuRcwMqxiFE0tTS4oTkrPNdQrTswt Ls1L10vOz93ECAmNLzsYFx+zOsQowMGoxMO7oVA4SIg1say4MvcQowQHs5II77YMoBBvSmJl VWpRfnxRaU5q8SFGJg5OqQZG5+C7XLNj4p9ztopo6ekbbXsWsuuPdvA/iz082y3Kln3vr3g7 J0b00cUTjCfVHnadLuTfOJePpeTkWzfLdfHHZqwsepISV5/cuIhlBs8sEyXfVwndR98/7Jxc MNfu71zGpuA/50WKX9/jZHVMt2EXZa57+ah6f+Oq6b05NzV53ZQ0vHdO2/9SiaU4I9FQi7mo OBEA4jRPJ+sBAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130820_121659_213203_8B524913 X-CRM114-Status: UNSURE ( 8.44 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -9.7 (---------) Cc: Kukjin Kim , Linus Walleij , Kyungmin Park , linux-samsung-soc@vger.kernel.org, Thomas Abraham , Tomasz Figa X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Calling pinctrl_register() means that the driver is fully initialized and might accept pinmux/pinconf requests, so pin groups must be parsed before. This patch fixes this problem by moving device tree parsing before call to pinctrl_register(). In addition, this fixes support for hogs on pin controllers handled by pinctrl-samsung driver. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- drivers/pinctrl/pinctrl-samsung.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c index a7fa9e2..439f2ef 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c @@ -767,6 +767,10 @@ static int samsung_pinctrl_register(struct platform_device *pdev, } } + ret = samsung_pinctrl_parse_dt(pdev, drvdata); + if (ret) + return ret; + drvdata->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, drvdata); if (!drvdata->pctl_dev) { dev_err(&pdev->dev, "could not register pinctrl driver\n"); @@ -784,12 +788,6 @@ static int samsung_pinctrl_register(struct platform_device *pdev, pinctrl_add_gpio_range(drvdata->pctl_dev, &pin_bank->grange); } - ret = samsung_pinctrl_parse_dt(pdev, drvdata); - if (ret) { - pinctrl_unregister(drvdata->pctl_dev); - return ret; - } - return 0; }