From patchwork Wed Aug 15 19:57:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 1326821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 51F9FDFFED for ; Wed, 15 Aug 2012 19:46:44 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T1jT0-0000hd-2q; Wed, 15 Aug 2012 19:41:22 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T1jSR-0000Ww-PN for linux-arm-kernel@lists.infradead.org; Wed, 15 Aug 2012 19:40:49 +0000 Received: from epcpsbgm1.samsung.com (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M8T00M0XANDZP00@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 16 Aug 2012 04:40:36 +0900 (KST) X-AuditID: cbfee61a-b7fc66d0000043b7-08-502bfb33ecaf Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id BB.13.17335.33BFB205; Thu, 16 Aug 2012 04:40:35 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M8T009KRANCNZB0@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 16 Aug 2012 04:40:35 +0900 (KST) From: Thomas Abraham To: linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] gpio: exynos4: skip gpiolib registration if pinctrl driver is used Date: Thu, 16 Aug 2012 01:27:35 +0530 Message-id: <1345060656-32201-4-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1345060656-32201-1-git-send-email-thomas.abraham@linaro.org> References: <1345060656-32201-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t9jAV2T39oBBlf5LTY9vsbqwOixeUl9 AGMUl01Kak5mWWqRvl0CV8b3t+/YCm7wVsxccZ+5gbGXu4uRk0NCwERiUk8/O4QtJnHh3nq2 LkYuDiGBRYwSDVNvQDnrmSQWLL3FAlLFJmAg8WjhO7AOEQEFic29z1hBipgFTjBK3O47CZYQ FoiRuP5yFpDNwcEioCpxe0YGSJhXwFPi/de/jBDblCQ29B5lArE5BbwkPs/sZAWxhYBq2trP sU5g5F3AyLCKUTS1ILmgOCk911CvODG3uDQvXS85P3cTI9jjz6R2MK5ssDjEKMDBqMTDy3BQ K0CINbGsuDL3EKMEB7OSCO+PU9oBQrwpiZVVqUX58UWlOanFhxilOViUxHmNvb/6CwmkJ5ak ZqemFqQWwWSZODilGhjX/Pfl4N70yV/6QEvsbK8f19hYWo41SN2fkLo173+Hlfy/bWvFp359 ejIgfl7aHa6deVGtHEKvtr4x39G2UPrENDdrxd7f6pUtBTbsK3j3WZ/NmqdVIqlX5yF7sU7n /va7SzLENe8+rZ+dGeip2V9rHXF1ppTWsvv3+usvGK2aOy24hWGHyAQlluKMREMt5qLiRAA9 E/Rk9AEAAA== X-TM-AS-MML: No X-Spam-Note: CRM114 invocation failed X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kgene.kim@samsung.com, patches@linaro.org, linus.walleij@linaro.org, rob.herring@calxeda.com, grant.likely@secretlab.ca, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.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 Pinctrl driver, when enabled, registers all the gpio pins and hence the registration of gpio pins by this driver can be skipped. Acked-by: Grant Likely Acked-by: Linus Walleij Signed-off-by: Thomas Abraham --- drivers/gpio/gpio-samsung.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 92f7b2b..8e61053 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -2734,6 +2734,27 @@ static __init void exynos4_gpiolib_init(void) int group = 0; void __iomem *gpx_base; +#ifdef CONFIG_OF + /* + * This gpio driver includes support for device tree support and + * there are platforms using it. In order to maintain + * compatibility with those platforms, and to allow non-dt + * Exynos4210 platforms to use this gpiolib support, a check + * is added to find out if there is a active pin-controller + * driver support available. If it is available, this gpiolib + * support is ignored and the gpiolib support available in + * pin-controller driver is used. This is a temporary check and + * will go away when all of the Exynos4210 platforms have + * switched to using device tree and the pin-ctrl driver. + */ + struct device_node *pctrl_np; + const char *pctrl_compat = "samsung,pinctrl-exynos4210"; + pctrl_np = of_find_compatible_node(NULL, NULL, pctrl_compat); + if (pctrl_np) + if (of_device_is_available(pctrl_np)) + return -ENODEV; +#endif + /* gpio part1 */ gpio_base1 = ioremap(EXYNOS4_PA_GPIO1, SZ_4K); if (gpio_base1 == NULL) {