From patchwork Wed Sep 5 09:58:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 1408091 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 60071DF264 for ; Wed, 5 Sep 2012 10:05:05 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9CPl-0005PO-Ev; Wed, 05 Sep 2012 10:00:53 +0000 Received: from eu1sys200aog108.obsmtp.com ([207.126.144.125]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9COh-000575-8J for linux-arm-kernel@lists.infradead.org; Wed, 05 Sep 2012 09:59:52 +0000 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob108.postini.com ([207.126.147.11]) with SMTP ID DSNKUEcijQwAAiTdK6CzvohE6rPCXDKZ3I2h@postini.com; Wed, 05 Sep 2012 09:59:47 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0A7342BE; Wed, 5 Sep 2012 09:59:34 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 955A227A4; Wed, 5 Sep 2012 09:59:34 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 0446EA8065; Wed, 5 Sep 2012 11:59:30 +0200 (CEST) Received: from lmenx30v.lme.st.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 5 Sep 2012 11:59:34 +0200 From: Loic Pallardy To: Samuel Ortiz , , , Linus Walleij Subject: [PATCH 03/17] arm: ux500: Create board-specific IRQ init callback Date: Wed, 5 Sep 2012 11:58:59 +0200 Message-ID: <1346839153-6465-4-git-send-email-loic.pallardy-ext@stericsson.com> X-Mailer: git-send-email 1.7.11.1 In-Reply-To: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com> References: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.125 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Loic Pallardy , Loic Pallardy , STEricsson_nomadik_linux , Loic Pallardy , Maxime Coquelin , Lee Jones , LT ST-Ericsson 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org First step to have a cpu-specific prcmu early init. Signed-off-by: Loic Pallardy Signed-off-by: Maxime Coquelin Acked-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500.c | 15 +++++++++++---- arch/arm/mach-ux500/cpu.c | 2 -- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index fa75f95..057dfdb 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -715,12 +716,18 @@ static void __init u9540_init_machine(void) regulator_has_full_constraints(); } +static void __init mop500_init_irq(void) +{ + prcmu_early_init(); + ux500_init_irq(); +} + MACHINE_START(U8500, "ST-Ericsson MOP500 platform") /* Maintainer: Srinidhi Kasagar */ .atag_offset = 0x100, .map_io = u8500_map_io, .nr_irqs = UX500_NR_IRQS, - .init_irq = ux500_init_irq, + .init_irq = mop500_init_irq, /* we re-use nomadik timer here */ .timer = &ux500_timer, .handle_irq = gic_handle_irq, @@ -732,7 +739,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") .atag_offset = 0x100, .map_io = u8500_map_io, .nr_irqs = UX500_NR_IRQS, - .init_irq = ux500_init_irq, + .init_irq = mop500_init_irq, .timer = &ux500_timer, .handle_irq = gic_handle_irq, .init_machine = hrefv60_init_machine, @@ -743,7 +750,7 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") .atag_offset = 0x100, .map_io = u8500_map_io, .nr_irqs = UX500_NR_IRQS, - .init_irq = ux500_init_irq, + .init_irq = mop500_init_irq, /* we re-use nomadik timer here */ .timer = &ux500_timer, .handle_irq = gic_handle_irq, @@ -755,7 +762,7 @@ MACHINE_START(U9540, "ST-Ericsson 9540 platform") .atag_offset = 0x100, .map_io = u8500_map_io, .nr_irqs = UX500_NR_IRQS, - .init_irq = ux500_init_irq, + .init_irq = mop500_init_irq, .timer = &ux500_timer, .handle_irq = gic_handle_irq, .init_machine = u9540_init_machine, diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index 4b0a9b3..4a5177b 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -68,8 +68,6 @@ void __init ux500_init_irq(void) * Init clocks here so that they are available for system timer * initialization. */ - if (cpu_is_u8500_family()) - db8500_prcmu_early_init(); clk_init(); }