From patchwork Tue Oct 21 17:47:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5127281 Return-Path: X-Original-To: patchwork-linux-rockchip@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 D617FC11AC for ; Tue, 21 Oct 2014 17:54:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00B3120225 for ; Tue, 21 Oct 2014 17:54:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 303252021F for ; Tue, 21 Oct 2014 17:54:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XgddG-0003H7-RX; Tue, 21 Oct 2014 17:54:06 +0000 Received: from mail-pd0-x230.google.com ([2607:f8b0:400e:c02::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XgdXT-0004UU-8A for linux-rockchip@lists.infradead.org; Tue, 21 Oct 2014 17:48:08 +0000 Received: by mail-pd0-f176.google.com with SMTP id fp1so1788878pdb.21 for ; Tue, 21 Oct 2014 10:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JkQ7TX/dhu8choNvnUwBQvZixNmO6WqUZJChJisbwsU=; b=Sn7NF1Vfy5Yyw2ECLpWHlWTB9DLspZpzMW0Ws7vFr3nN6NuV+hNTfxoULk1HiUZ3Xh /URSHjgFIvY1p3/teidH4zJyVMZG4XyhK7p3oiLOnOoLRtk9NPDowmTD5YUzvZedoB5m cFqpPVUA8GSCMDsJTzVBhHRv5KPbTj9Kq8t94= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JkQ7TX/dhu8choNvnUwBQvZixNmO6WqUZJChJisbwsU=; b=G72kvLqotjTMmJZoOW4Ctnipi/1TZQE7KIeMPDvxD0LB4f/A+p5LFh0H/zeftnF/j4 3dyvLEXtmPBYigNr1Wy2cGPIrzW2FxdMHhf1L4GqtLqH/TJIBX2tMBGm6gWqTbgI/Aed Y1tg2ojM/pVkPMipkLiQ/Bn7lP8MbDLjyvnkYFE3r3iWP8fVzdKIWJDs+DNMXdHCSlNA ehG7qS+PV80ses0VkkJ2/JK8YgqepQl3VIH7z3sPvctGuof7OI7W0x1Mk2Ce5EplTdX9 OTkvcsBgxyFUJyu1gJtNY0Gm6RJBV2CwRwwX7W/W5eTJ+AULseN4DwgHJT3zieyrMnk2 IJ7Q== X-Gm-Message-State: ALoCoQn2KlNQ5mz6HQxwxZOk51YQ9WNgnntfeuaHvjHFkJwLzwaAuijqVdqQ8V46hXsBRc+4PQn3 X-Received: by 10.67.3.36 with SMTP id bt4mr36309120pad.99.1413913665940; Tue, 21 Oct 2014 10:47:45 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.162.15]) by mx.google.com with ESMTPSA id ky4sm12336911pbc.55.2014.10.21.10.47.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 10:47:45 -0700 (PDT) From: Doug Anderson To: Linus Walleij , Heiko Stuebner Subject: [PATCH v2 3/4] pinctrl: rockchip: Parse pin groups before calling pinctrl_register() Date: Tue, 21 Oct 2014 10:47:34 -0700 Message-Id: <1413913655-22351-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1413913655-22351-1-git-send-email-dianders@chromium.org> References: <1413913655-22351-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141021_104807_333188_1A482908 X-CRM114-Status: GOOD ( 10.10 ) X-Spam-Score: -0.8 (/) Cc: Doug Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Chris Zhong , Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Just like in (529301c pinctrl: samsung: Parse pin groups before calling pinctrl_register()), Rockchip also needs to parse pin groups earlier to make hogs work. Signed-off-by: Doug Anderson Tested-by: Chris Zhong Reviewed-by: Heiko Stuebner --- Changes in v2: None drivers/pinctrl/pinctrl-rockchip.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 8a3c582..6c14f6c 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -1262,6 +1262,10 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, } } + ret = rockchip_pinctrl_parse_dt(pdev, info); + if (ret) + return ret; + info->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, info); if (!info->pctl_dev) { dev_err(&pdev->dev, "could not register pinctrl driver\n"); @@ -1279,12 +1283,6 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, pinctrl_add_gpio_range(info->pctl_dev, &pin_bank->grange); } - ret = rockchip_pinctrl_parse_dt(pdev, info); - if (ret) { - pinctrl_unregister(info->pctl_dev); - return ret; - } - return 0; }