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:14:02 +0000 |
| commit | 368b8e252335725ea72d7bcbb3b1c8837b8dfeed (patch) | |
| tree | 94593740f2ec1dddc0aa458bcc9014e0d0b726d1 /arch/arm | |
| parent | ead31ee5ed00d2b95922d868cd0d63da23e47213 (diff) | |
| download | linux-3.10-368b8e252335725ea72d7bcbb3b1c8837b8dfeed.tar.gz linux-3.10-368b8e252335725ea72d7bcbb3b1c8837b8dfeed.tar.bz2 linux-3.10-368b8e252335725ea72d7bcbb3b1c8837b8dfeed.zip | |
ARM: zynq: convert to CONFIG_MULTI_IRQ_HANDLER
Convert the zynq platform to be using the gic_handle_irq
function as its primary interrupt handler.
Acked-by: John Linn <john.linn@xilinx.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-zynq/common.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/entry-macro.S | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 21644caeb29..d99ee9ba232 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -979,6 +979,7 @@ config ARCH_ZYNQ select ARM_AMBA select ICST select USE_OF + select MULTI_IRQ_HANDLER help Support for Xilinx Zynq ARM Cortex A9 Platform endchoice diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 73e93687b81..ab5cfddc0d7 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -112,6 +112,7 @@ static const char *xilinx_dt_match[] = { MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") .map_io = xilinx_map_io, .init_irq = xilinx_irq_init, + .handle_irq = gic_handle_irq, .init_machine = xilinx_init_machine, .timer = &xttcpss_sys_timer, .dt_compat = xilinx_dt_match, diff --git a/arch/arm/mach-zynq/include/mach/entry-macro.S b/arch/arm/mach-zynq/include/mach/entry-macro.S index 3cfc01b3746..d621fb73256 100644 --- a/arch/arm/mach-zynq/include/mach/entry-macro.S +++ b/arch/arm/mach-zynq/include/mach/entry-macro.S @@ -20,9 +20,6 @@ * GNU General Public License for more details. */ -#include <mach/hardware.h> -#include <asm/hardware/entry-macro-gic.S> - .macro disable_fiq .endm |