From patchwork Wed Feb 22 12:14:17 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: 6883 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 610DF1CCAC5 for ; Wed, 22 Feb 2012 12:08:10 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 236E6A186E0 for ; Wed, 22 Feb 2012 12:08:10 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so14332530iab.11 for ; Wed, 22 Feb 2012 04:08:09 -0800 (PST) Received: from mr.google.com ([10.43.52.74]) by 10.43.52.74 with SMTP id vl10mr31873110icb.55.1329912489975 (num_hops = 1); Wed, 22 Feb 2012 04:08:09 -0800 (PST) MIME-Version: 1.0 Received: by 10.43.52.74 with SMTP id vl10mr25519418icb.55.1329912489926; Wed, 22 Feb 2012 04:08:09 -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.231.11.10 with SMTP id r10csp133317ibr; Wed, 22 Feb 2012 04:08:09 -0800 (PST) Received: by 10.68.197.72 with SMTP id is8mr3607191pbc.31.1329912488838; Wed, 22 Feb 2012 04:08:08 -0800 (PST) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by mx.google.com with ESMTP id h4si28511848pbk.347.2012.02.22.04.08.08; Wed, 22 Feb 2012 04:08:08 -0800 (PST) Received-SPF: neutral (google.com: 203.254.224.34 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.34; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.34 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm2.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LZS00E24N19BJB0@mailout4.samsung.com> for patches@linaro.org; Wed, 22 Feb 2012 21:08:07 +0900 (KST) X-AuditID: cbfee61b-b7c62ae000000989-25-4f44daa7a871 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id 70.56.02441.7AAD44F4; Wed, 22 Feb 2012 21:08:07 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTPA id <0LZS00GJLN166U60@mmp1.samsung.com> for patches@linaro.org; Wed, 22 Feb 2012 21:08:07 +0900 (KST) From: Thomas Abraham To: linux-samsung-soc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, grant.likely@secretlab.ca, rob.herring@calxeda.com, kgene.kim@samsung.com, patches@linaro.org Subject: [PATCH v3 3/4] ARM: Exynos4: Remove arch_initcall for wakeup interrupt initialization Date: Wed, 22 Feb 2012 17:44:17 +0530 Message-id: <1329912858-32750-4-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1329912858-32750-1-git-send-email-thomas.abraham@linaro.org> References: <1329912858-32750-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: AAAAAA== X-Gm-Message-State: ALoCoQlANKaCU2PYsEmtjEKdFsiQfhznSaChRa2t9geUgeTzaEK/wg73RaKmoJdkPVvdj513JTin 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/common.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index ed50185..888e703 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -81,6 +81,8 @@ static struct cpu_table cpu_ids[] __initdata = { }, }; +static int exynos4_init_irq_eint(void); + /* Initial IO mappings */ static struct map_desc exynos_iodesc[] __initdata = { @@ -485,6 +487,7 @@ void __init exynos4_init_irq(void) * uses GIC instead of VIC. */ s5p_init_irq(NULL, 0); + exynos4_init_irq_eint(); } struct bus_type exynos4_subsys = { @@ -775,4 +778,3 @@ static int __init exynos4_init_irq_eint(void) irq_set_handler_data(IRQ_EINT16_31, &eint_data); return 0; } -arch_initcall(exynos4_init_irq_eint);