From patchwork Wed Oct 24 14:37:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 1638741 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 599BE3FD4E for ; Wed, 24 Oct 2012 14:40:20 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TR262-0004XJ-Vu; Wed, 24 Oct 2012 14:38:15 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TR25l-0004Sc-4n for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2012 14:37:58 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MCE0051IJAR5TE0@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2012 23:37:52 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-e6-5087fd4063a4 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id E4.99.01231.04DF7805; Wed, 24 Oct 2012 23:37:52 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MCE008EXJASPN20@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2012 23:37:52 +0900 (KST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on Exynos4x12 Date: Wed, 24 Oct 2012 16:37:34 +0200 Message-id: <1351089457-8205-2-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1351089457-8205-1-git-send-email-t.figa@samsung.com> References: <1351089457-8205-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrEJMWRmVeSWpSXmKPExsVy+t9jAV2Hv+0BBue6VCw2Pb7G6sDosXlJ fQBjFJdNSmpOZllqkb5dAlfGyofLGAtauSs2L3zM2MC4hrOLkZNDQsBEomPfcnYIW0ziwr31 bF2MXBxCAosYJbrez2WFcDYzSRy+/YANpIpNQE3ic8MjMFtEQENiStdjdpAiZoHJTBJH/58C GyUskChxZPkqVhCbRUBVYsOzv0BxDg5eAUeJZy2eENvkJZ7e7wObwyngJHH77hIWEFsIqOTI rE1sExh5FzAyrGIUTS1ILihOSs811CtOzC0uzUvXS87P3cQI9vkzqR2MKxssDjEKcDAq8fBm nG8LEGJNLCuuzD3EKMHBrCTCO/lBe4AQb0piZVVqUX58UWlOavEhRmkOFiVx3maPlAAhgfTE ktTs1NSC1CKYLBMHp1QDY/rLi6lftr6Y8aDI4DXz8m9GOuHPZK96nd51LoyzO3zGxXDpI0tT b554VtU2j89l5Zx1XB3zb0+ruWLfubfkuIC08K//1y958UnMnCFfVTzr9qlrcsdKfRr8q9Zk PPX9sysmyYKv0udZg8v5WxWC9cqy8nwaOyP/mpp1inZET9iw6ivv5/kbvJVYijMSDbWYi4oT AWbt2Cb1AQAA X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.6 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.34 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linus.walleij@linaro.org, kgene.kim@samsung.com, swarren@wwwdotorg.org, t.figa@samsung.com, tomasz.figa@gmail.com, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, thomas.abraham@linaro.org, devicetree-discuss@lists.ozlabs.org, m.szyprowski@samsung.com 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 This patch modifies the old wakeup interrupt initialization code to detect pinctrl driver by using for_each_matching_node instead of for_each_compatible_node and adds match table for both Exynos4210 and Exynos4x12. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos/common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index cb891a7..109f878 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -1032,11 +1032,14 @@ static int __init exynos_init_irq_eint(void) * platforms switch over to using the pinctrl driver, the wakeup * interrupt support code here can be completely removed. */ + static const struct of_device_id exynos_pinctrl_ids[] = { + { .compatible = "samsung,pinctrl-exynos4210", }, + { .compatible = "samsung,pinctrl-exynos4x12", }, + }; struct device_node *pctrl_np, *wkup_np; - const char *pctrl_compat = "samsung,pinctrl-exynos4210"; const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; - for_each_compatible_node(pctrl_np, NULL, pctrl_compat) { + for_each_matching_node(pctrl_np, exynos_pinctrl_ids) { if (of_device_is_available(pctrl_np)) { wkup_np = of_find_compatible_node(pctrl_np, NULL, wkup_compat);