diff options
| author |   Marc Zyngier <marc.zyngier@arm.com> | 2011-09-06 10:23:45 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2011-11-15 18:13:59 +0000 |
| commit | 7e01799c669c60460dce43556065ca3b66760dcf (patch) | |
| tree | 71186ea2c7adb86df73b2c29ee3ef0072cb64768 /arch/arm | |
| parent | ARM: imx: convert smp platforms to global gic_handle_irq() (diff) | |
| download | linux-dev-7e01799c669c60460dce43556065ca3b66760dcf.tar.xz linux-dev-7e01799c669c60460dce43556065ca3b66760dcf.zip | |
ARM: highbank: convert to CONFIG_MULTI_IRQ_HANDLER
Convert the highbank platform to be using the gic_handle_irq
function as its primary interrupt handler.
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-highbank/include/mach/entry-macro.S | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 44789eff983f..5c014c6f056d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -345,6 +345,7 @@ config ARCH_HIGHBANK select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU select USE_OF + select MULTI_IRQ_HANDLER help Support for the Calxeda Highbank SoC based boards. diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index b82dcf08e747..89bdf0039f7b 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -140,6 +140,7 @@ DT_MACHINE_START(HIGHBANK, "Highbank") .map_io = highbank_map_io, .init_irq = highbank_init_irq, .timer = &highbank_timer, + .handle_irq = gic_handle_irq, .init_machine = highbank_init, .dt_compat = highbank_match, MACHINE_END diff --git a/arch/arm/mach-highbank/include/mach/entry-macro.S b/arch/arm/mach-highbank/include/mach/entry-macro.S index 73c11297509e..a14f9e62ca92 100644 --- a/arch/arm/mach-highbank/include/mach/entry-macro.S +++ b/arch/arm/mach-highbank/include/mach/entry-macro.S @@ -1,5 +1,3 @@ -#include <asm/hardware/entry-macro-gic.S> - .macro disable_fiq .endm |