From patchwork Sat Mar 24 09:41:14 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: 7444 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 1FBC623E0C for ; Sat, 24 Mar 2012 09:36:40 +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 DC84AA186BB for ; Sat, 24 Mar 2012 09:36:39 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so7727536iag.11 for ; Sat, 24 Mar 2012 02:36:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version: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-tm-as-mml :x-gm-message-state; bh=wmyWHE0SW+yGicfZ9MgPPN6fZddy0h2wHhkhiyV5AXQ=; b=VLm1tx+kCFDBdKZnD/2SGRT28OHQJnVEiAVV17FOgDBJ0k5L6dzhhwfNCH+/aaBHLa hBzk7Uw3hOhFPQL9gCh41vtJNxRAL+fYldANHkcWrrPuFBtGEYXvj2UBBWV7DY9vSAIC WUwBAxnlt7XYHeI/eabED6o897SOJ/ZNHGOTf8JpGRl67LHz8EbyiwN01eBibMF9T4gJ dndUc7aiW8J6rZpWJzE1T/PUoZMQbGWG022Yex3V8sJOxKOPmR1rkBsOafNxCiduhkUR LvFCtkOQPCVOcMfEXJmOrtA/4iAy/L/p7yk8c6Z6v8nWO6l5M7QEv3LhpoHT11oElnEh NRug== MIME-Version: 1.0 Received: by 10.50.47.231 with SMTP id g7mr1121004ign.12.1332581799691; Sat, 24 Mar 2012 02:36:39 -0700 (PDT) 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.203.79 with SMTP id fh15csp43517ibb; Sat, 24 Mar 2012 02:36:39 -0700 (PDT) Received: by 10.68.234.134 with SMTP id ue6mr37059947pbc.14.1332581799002; Sat, 24 Mar 2012 02:36:39 -0700 (PDT) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by mx.google.com with ESMTP id c10si11994614pbd.176.2012.03.24.02.36.38; Sat, 24 Mar 2012 02:36:38 -0700 (PDT) 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 epcpsbgm2.samsung.com (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0M1D006OVUOYDWE0@mailout3.samsung.com> for patches@linaro.org; Sat, 24 Mar 2012 18:36:37 +0900 (KST) X-AuditID: cbfee61b-b7baeae000004fa7-ca-4f6d95a5f354 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id 89.79.20391.5A59D6F4; Sat, 24 Mar 2012 18:36:37 +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 <0M1D00D9XUORGL60@mmp1.samsung.com> for patches@linaro.org; Sat, 24 Mar 2012 18:36:37 +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 v4 3/4] ARM: Exynos: Remove arch_initcall for wakeup interrupt initialization Date: Sat, 24 Mar 2012 15:11:14 +0530 Message-id: <1332582075-16204-4-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1332582075-16204-1-git-send-email-thomas.abraham@linaro.org> References: <1332582075-16204-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: AAAAAA== X-TM-AS-MML: No X-Gm-Message-State: ALoCoQmIxwqXF18372Lk+0VTLifla3Wqq/DFV0IWeSb0Prff2xJAAWN2jXBa/l1GMQnm3dz1vVV+ 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 Acked-by: Rob Herring --- 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 b69f36a..7aa1919 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -64,6 +64,7 @@ static void exynos4_init_clocks(int xtal); static void exynos5_init_clocks(int xtal); static void exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no); static int exynos_init(void); +static int exynos_init_irq_eint(void); static struct cpu_table cpu_ids[] __initdata = { { @@ -608,6 +609,7 @@ void __init exynos4_init_irq(void) * uses GIC instead of VIC. */ s5p_init_irq(NULL, 0); + exynos_init_irq_eint(); } void __init exynos5_init_irq(void) @@ -620,6 +622,7 @@ void __init exynos5_init_irq(void) * uses GIC instead of VIC. */ s5p_init_irq(NULL, 0); + exynos_init_irq_eint(); } struct bus_type exynos4_subsys = { @@ -1048,4 +1051,3 @@ static int __init exynos_init_irq_eint(void) return 0; } -arch_initcall(exynos_init_irq_eint);