From patchwork Mon Feb 25 03:49:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2180101 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 60EF83FCA4 for ; Mon, 25 Feb 2013 03:57:29 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U9p9H-0005Gl-Rk; Mon, 25 Feb 2013 03:54:44 +0000 Received: from mail-pb0-f54.google.com ([209.85.160.54]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U9p6V-0003Px-Ex for linux-arm-kernel@lists.infradead.org; Mon, 25 Feb 2013 03:51:52 +0000 Received: by mail-pb0-f54.google.com with SMTP id rr4so1418057pbb.27 for ; Sun, 24 Feb 2013 19:51:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=jh0ZCpHrU072rSkVV2ct7UswjtSWGjITG3G2dXh+U2Q=; b=HWGeVNA/H13XBWHrWLUdizt9N555SaLCQPuq4BxehyMKqDBeOR9VbhXpVFdfLlzRGs 9MKHWHjjPkmKwB9aYvSiPHtzHXgPoFWSHw8cPR1DFf4ZtcG+fOTi5d/8yTDym863ib2Y kVMEChJd0d9s2DJI0nroZOsxsAcvkj3a4qO/xESi6ETSpDsuJAN5cvxvbl7V3p9FXvjH C409X6h3o3FclK6CNQLBWsEQmmQeuyUqoX/hbh0I0MAZ1eMSX9uW8ywta5qOsOyN7XUT rQMvkkF6gfanMizC+KdEg70RIu2PsI3436RB6tdL70GolokC4+LlxBqj6Hax8PhwUZ67 9nIg== X-Received: by 10.68.197.168 with SMTP id iv8mr15616175pbc.114.1361764310618; Sun, 24 Feb 2013 19:51:50 -0800 (PST) Received: from localhost.localdomain ([67.198.145.34]) by mx.google.com with ESMTPS id b9sm11188695pba.6.2013.02.24.19.51.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 24 Feb 2013 19:51:49 -0800 (PST) From: Haojian Zhuang To: grinberg@compulab.co.il, linus.walleij@linaro.org, linux@arm.linux.org.uk, marek.vasut@gmail.com, robert.jarzmik@free.fr, daniel@caiaq.de, linux-arm-kernel@lists.infradead.org, grant.likely@secretlab.ca, cxie4@marvell.com Subject: [PATCH v5 11/12] gpio: pxa: bind to pinctrl by request Date: Mon, 25 Feb 2013 11:49:40 +0800 Message-Id: <1361764181-26647-12-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361764181-26647-1-git-send-email-haojian.zhuang@linaro.org> References: <1361764181-26647-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQnlk9JmD74vTeQGZt2w6lE0NApZ6mlZ4PQ4baF5h/uea8LiJdwUC5F/4zJXi1Hh3Sd00pu5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130224_225151_687468_62D80B05 X-CRM114-Status: GOOD ( 12.46 ) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.54 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Haojian Zhuang , patches@linaro.org 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org While gpio pins is requested, request the pin of pinctrl driver first. Signed-off-by: Haojian Zhuang Tested-by: Igor Grinberg --- drivers/gpio/gpio-pxa.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 91f4881..f2f7737 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -154,6 +155,23 @@ int pxa_irq_to_gpio(int irq) return irq - irq_base; } +static int pxa_gpio_request(struct gpio_chip *gc, unsigned offset) +{ + /* + * Map back to global GPIO space and request muxing, the direction + * parameter does not matter for this controller. + */ + int gpio = gc->base + offset; + + /* + * Platforms in ARCH_PXA doesn't move to device tree yet, + * and PINCTRL_SINGLE is depend on device tree. + */ + if (IS_ENABLED(CONFIG_PINCTRL_SINGLE)) + return pinctrl_request_gpio(gpio); + return 0; +} + static int pxa_gpio_direction_input(struct gpio_chip *gc, unsigned offset) { void __iomem *base = gpio_chip_base(gc); @@ -258,6 +276,7 @@ static int pxa_init_gpio_chip(struct platform_device *pdev, int gpio_end) gc->base = gpio; gc->label = chips[i].label; + gc->request = pxa_gpio_request; gc->direction_input = pxa_gpio_direction_input; gc->direction_output = pxa_gpio_direction_output; gc->get = pxa_gpio_get;