From patchwork Thu Dec 13 11:54:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 13525 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 02F4F23FB5 for ; Thu, 13 Dec 2012 11:23:28 +0000 (UTC) Received: from mail-ie0-f173.google.com (mail-ie0-f173.google.com [209.85.223.173]) by fiordland.canonical.com (Postfix) with ESMTP id BC995A19833 for ; Thu, 13 Dec 2012 11:23:27 +0000 (UTC) Received: by mail-ie0-f173.google.com with SMTP id e13so3721535iej.4 for ; Thu, 13 Dec 2012 03:23:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-brightmail-tracker:x-gm-message-state; bh=48xl6+kz9N6wSWRUOI8+5F6ZnxR+GqdDxcioh2Z5jrQ=; b=IW4DWYmL6327YOvnpnhyBzTk8YVbSh+6wfuA29kQ3eUEAm7vh1hNXIz/1ADr3dPNLy 4wAH6Mhx2ymvtS2XQ5IsqRyujQFc7zZqSIz08YpFZuTOoGCP3iAu6Myo05V+zLXibQfw aqTYdP07thVVM/+8vwjvCrLdJIymDWIM6g3PRCdYSUf6r6xdTeTSmlrt2b4+enraQrG9 Pv70n6+EaBtHHntYckqqMnOehP+Bn7BQmGe5xZ79Nz2OjRLIGSXcpw5o0AgUHmuYAQJJ acOPy0HP+PFp6BhMiGK15zadcxzBP+GPtSQDjpHowcOxSTXqDt7/9jDJYuJ8jGNRp+ns JP5w== Received: by 10.50.161.169 with SMTP id xt9mr16207125igb.62.1355397807203; Thu, 13 Dec 2012 03:23:27 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp4283igt; Thu, 13 Dec 2012 03:23:26 -0800 (PST) Received: by 10.66.82.198 with SMTP id k6mr5320403pay.53.1355397806495; Thu, 13 Dec 2012 03:23:26 -0800 (PST) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by mx.google.com with ESMTP id i7si1682168pay.334.2012.12.13.03.23.25; Thu, 13 Dec 2012 03:23:26 -0800 (PST) Received-SPF: neutral (google.com: 203.254.224.33 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.33; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.33 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MEY00DQ8VMLU3W0@mailout3.samsung.com>; Thu, 13 Dec 2012 20:23:24 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-e2-50c9baacc6e8 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 7F.F1.01231.CAAB9C05; Thu, 13 Dec 2012 20:23:24 +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 <0MEY00KX7VIGR310@mmp1.samsung.com>; Thu, 13 Dec 2012 20:23:24 +0900 (KST) From: Thomas Abraham To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linus.walleij@linaro.org, kgene.kim@samsung.com, t.figa@samsung.com, patches@linaro.org Subject: [PATCH 2/3] gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250 Date: Thu, 13 Dec 2012 17:24:03 +0530 Message-id: <1355399644-29417-3-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1355399644-29417-1-git-send-email-thomas.abraham@linaro.org> References: <1355399644-29417-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOJMWRmVeSWpSXmKPExsVy+t9jAd01u04GGPzbb2Ix5c9yJosph7+w ODB53Lm2hy2AMYrLJiU1J7MstUjfLoEr40frWdaCY2wV+99cYG9gPMHaxcjJISFgInF/6XMW CFtM4sK99WxdjFwcQgKLGCU27TvHBOG0MUn83riIDaSKTcBA4tHCd+wgtoiAgsTm3mesIEXM AisYJU50fQVKcHAIC+RITDtuAGKyCKhKzN7FB1LOK+Ap8f3gGWaIZUoSG3qPMoHYnAJeEm3L u8COEAKqOfTpE9sERt4FjAyrGEVTC5ILipPScw31ihNzi0vz0vWS83M3MYK9/0xqB+PKBotD jAIcjEo8vAXhJwOEWBPLiitzDzFKcDArifD6LwcK8aYkVlalFuXHF5XmpBYfYpTmYFES5232 SAkQEkhPLEnNTk0tSC2CyTJxcEo1MGYf/nj/tVvCzpMmrjqT9n2QZhCwe+7T4/IlOf/f2oWf V4tVmgSbd8Z+z/z4XjV8e3DInvkTmTqaHjK66uzfp7d973LmXeZJBy8myUxqYJgw/wbLvoYi faXMrX8VZ55U17OVnsb4Lowtbb3O547oy3Ysx18zrF5TGHI4KP9iiYR8hlb1toNrryqxFGck GmoxFxUnAgAQ7SAc+gEAAA== X-Gm-Message-State: ALoCoQkhnJwlcB+mkhe8SM++OY5Yi809RKfksC5bUbx401ZcMQ/hxwk0CxNhx03ljArO83lffk2F Skip exynos5250 gpiolib registration if pinctrl support for exynos5250 is enabled. Signed-off-by: Thomas Abraham --- drivers/gpio/gpio-samsung.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 01f7fe9..849c134 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -3026,6 +3026,7 @@ static __init int samsung_gpiolib_init(void) static const struct of_device_id exynos_pinctrl_ids[] = { { .compatible = "samsung,pinctrl-exynos4210", }, { .compatible = "samsung,pinctrl-exynos4x12", }, + { .compatible = "samsung,pinctrl-exynos5250", }, }; for_each_matching_node(pctrl_np, exynos_pinctrl_ids) if (pctrl_np && of_device_is_available(pctrl_np))