From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 06/17] ARM: RealView: convert to CONFIG_MULTI_IRQ_HANDLER
Date: Fri, 4 Nov 2011 16:57:40 +0000 [thread overview]
Message-ID: <1320425871-30564-7-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1320425871-30564-1-git-send-email-marc.zyngier@arm.com>
Convert the RealView platforms to be using the gic_handle_irq
function as their primary interrupt handler.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-realview/include/mach/entry-macro.S | 2 --
arch/arm/mach-realview/realview_eb.c | 1 +
arch/arm/mach-realview/realview_pb1176.c | 1 +
arch/arm/mach-realview/realview_pb11mp.c | 1 +
arch/arm/mach-realview/realview_pba8.c | 1 +
arch/arm/mach-realview/realview_pbx.c | 1 +
7 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 503daf0..918d466 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -278,6 +278,7 @@ config ARCH_REALVIEW
select ARM_TIMER_SP804
select GPIO_PL061 if GPIOLIB
select NEED_MACH_MEMORY_H
+ select MULTI_IRQ_HANDLER
help
This enables support for ARM Ltd RealView boards.
diff --git a/arch/arm/mach-realview/include/mach/entry-macro.S b/arch/arm/mach-realview/include/mach/entry-macro.S
index 4071164..e8a5179 100644
--- a/arch/arm/mach-realview/include/mach/entry-macro.S
+++ b/arch/arm/mach-realview/include/mach/entry-macro.S
@@ -7,8 +7,6 @@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-#include <mach/hardware.h>
-#include <asm/hardware/entry-macro-gic.S>
.macro disable_fiq
.endm
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 427e44e..f01e332 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -470,6 +470,7 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB")
.init_early = realview_init_early,
.init_irq = gic_init_irq,
.timer = &realview_eb_timer,
+ .handle_irq = gic_handle_irq,
.init_machine = realview_eb_init,
#ifdef CONFIG_ZONE_DMA
.dma_zone_size = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index ad227c4..d329b37 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -393,6 +393,7 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")
.init_early = realview_init_early,
.init_irq = gic_init_irq,
.timer = &realview_pb1176_timer,
+ .handle_irq = gic_handle_irq,
.init_machine = realview_pb1176_init,
#ifdef CONFIG_ZONE_DMA
.dma_zone_size = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 6cb8318..32d18e5 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -367,6 +367,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")
.init_early = realview_init_early,
.init_irq = gic_init_irq,
.timer = &realview_pb11mp_timer,
+ .handle_irq = gic_handle_irq,
.init_machine = realview_pb11mp_init,
#ifdef CONFIG_ZONE_DMA
.dma_zone_size = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 3db72c5..0896cc4 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -317,6 +317,7 @@ MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
.init_early = realview_init_early,
.init_irq = gic_init_irq,
.timer = &realview_pba8_timer,
+ .handle_irq = gic_handle_irq,
.init_machine = realview_pba8_init,
#ifdef CONFIG_ZONE_DMA
.dma_zone_size = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index bea4212..cac0b69 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -400,6 +400,7 @@ MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")
.init_early = realview_init_early,
.init_irq = gic_init_irq,
.timer = &realview_pbx_timer,
+ .handle_irq = gic_handle_irq,
.init_machine = realview_pbx_init,
#ifdef CONFIG_ZONE_DMA
.dma_zone_size = SZ_256M,
--
1.7.0.4
next prev parent reply other threads:[~2011-11-04 16:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-04 16:57 [PATCH v3 00/17] Switch GIC users (and omap2plus) to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 01/17] ARM: Make global handler and CONFIG_MULTI_IRQ_HANDLER mutually exclusive Marc Zyngier
2011-11-04 18:30 ` Nicolas Pitre
2011-11-04 20:37 ` Eric Miao
2011-11-07 9:45 ` Jamie Iles
2011-11-07 11:02 ` Linus Walleij
2011-11-07 11:12 ` Marc Zyngier
2011-11-07 11:17 ` Jamie Iles
2011-11-07 11:22 ` Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 02/17] ARM: mxc: rename gic_handle_irq to avoid name clash Marc Zyngier
2011-11-04 21:09 ` Shawn Guo
2011-11-04 16:57 ` [PATCH v3 03/17] ARM: GIC: Add global gic_handle_irq() function Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 04/17] ARM: mxc: convert smp platforms to global gic_handle_irq() Marc Zyngier
2011-11-04 21:15 ` Shawn Guo
2011-11-07 14:01 ` Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 05/17] ARM: highbank: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 18:30 ` Rob Herring
2011-11-04 16:57 ` Marc Zyngier [this message]
2011-11-04 16:57 ` [PATCH v3 07/17] ARM: VExpress: " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 08/17] ARM: msm: convert SMP platforms " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 09/17] ARM: exynos4: convert " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 10/17] ARM: tegra2: " Marc Zyngier
2011-11-04 19:48 ` Olof Johansson
2011-11-04 16:57 ` [PATCH v3 11/17] ARM: ux500: " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 12/17] ARM: shmobile: convert smp platforms to gic_handle_irq() Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 13/17] ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 14/17] ARM: zynq: " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 15/17] ARM: omap2/3: Add global omap2/3_intc_handle_irq() functions Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 16/17] ARM: omap2plus: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 17/17] ARM: GIC: Make MULTI_IRQ_HANDLER mandatory Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320425871-30564-7-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).