From patchwork Wed Dec 7 13:59:51 2011 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: 5531 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 3FD5B23E19 for ; Wed, 7 Dec 2011 14:00:18 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 366E9A18C9C for ; Wed, 7 Dec 2011 14:00:18 +0000 (UTC) Received: by eaac11 with SMTP id c11so583058eaa.11 for ; Wed, 07 Dec 2011 06:00:18 -0800 (PST) Received: by 10.213.33.203 with SMTP id i11mr3481815ebd.32.1323266418015; Wed, 07 Dec 2011 06:00:18 -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.205.129.2 with SMTP id hg2cs71288bkc; Wed, 7 Dec 2011 06:00:17 -0800 (PST) Received: by 10.68.24.234 with SMTP id x10mr5712968pbf.97.1323266315223; Wed, 07 Dec 2011 05:58:35 -0800 (PST) Received: from mailout2.samsung.com (mailout2.samsung.com. [203.254.224.25]) by mx.google.com with ESMTP id j1si3391600pbi.37.2011.12.07.05.58.34; Wed, 07 Dec 2011 05:58:35 -0800 (PST) Received-SPF: neutral (google.com: 203.254.224.25 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.25; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.25 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 (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LVU007956T8LU40@mailout2.samsung.com> for patches@linaro.org; Wed, 07 Dec 2011 22:58:33 +0900 (KST) X-AuditID: cbfee61a-b7b89ae000001a15-03-4edf71092bce Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (MMPCPMTA) with SMTP id 38.F2.06677.9017FDE4; Wed, 07 Dec 2011 22:58:33 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTPA id <0LVU00BJT6TAY680@mmp2.samsung.com> for patches@linaro.org; Wed, 07 Dec 2011 22:58:33 +0900 (KST) From: Thomas Abraham To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, kgene.kim@samsung.com, patches@linaro.org Subject: [PATCH 3/4] arm: exynos4: remove arch_initcall for wakeup interrupt source initialization Date: Wed, 07 Dec 2011 19:29:51 +0530 Message-id: <1323266392-28330-4-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1323266392-28330-3-git-send-email-thomas.abraham@linaro.org> References: <1323266392-28330-1-git-send-email-thomas.abraham@linaro.org> <1323266392-28330-2-git-send-email-thomas.abraham@linaro.org> <1323266392-28330-3-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: AAAAAA== The of_irq_init function would be setup to invoke the exynos4_init_irq_eint function when booting using device tree. The arch_initcall for exynos4_init_irq_eint would duplicate its invocation in that case. Hence, arch_initcall for exynos4_init_irq_eint is removed and this function is invoked from the exynos4_init_irq for non-dt case. Moreover, with single kernel image build, the exynos4_init_irq_eint has no checks to ensure that it is running on a exynos4 platform. So it would be appropriate to invoke it from exynos4_init_irq. Signed-off-by: Thomas Abraham --- arch/arm/mach-exynos/cpu.c | 1 + arch/arm/mach-exynos/irq-eint.c | 2 -- arch/arm/plat-samsung/include/plat/exynos4.h | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/cpu.c b/arch/arm/mach-exynos/cpu.c index 8e09f34..6d27c36 100644 --- a/arch/arm/mach-exynos/cpu.c +++ b/arch/arm/mach-exynos/cpu.c @@ -278,6 +278,7 @@ void __init exynos4_init_irq(void) * uses GIC instead of VIC. */ s5p_init_irq(NULL, 0); + exynos4_init_irq_eint(); } struct sysdev_class exynos4_sysclass = { diff --git a/arch/arm/mach-exynos/irq-eint.c b/arch/arm/mach-exynos/irq-eint.c index a65da64..771b156 100644 --- a/arch/arm/mach-exynos/irq-eint.c +++ b/arch/arm/mach-exynos/irq-eint.c @@ -233,5 +233,3 @@ int __init exynos4_init_irq_eint(void) return 0; } - -arch_initcall(exynos4_init_irq_eint); diff --git a/arch/arm/plat-samsung/include/plat/exynos4.h b/arch/arm/plat-samsung/include/plat/exynos4.h index f546e88..a501461 100644 --- a/arch/arm/plat-samsung/include/plat/exynos4.h +++ b/arch/arm/plat-samsung/include/plat/exynos4.h @@ -24,6 +24,7 @@ extern void exynos4_init_irq(void); extern void exynos4_map_io(void); extern void exynos4_init_clocks(int xtal); extern struct sys_timer exynos4_timer; +extern int exynos4_init_irq_eint(void); #define exynos4_init_uarts exynos4_common_init_uarts