Commit 368b8e25 authored by Marc Zyngier's avatar Marc Zyngier

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: default avatarJohn Linn <john.linn@xilinx.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent ead31ee5
...@@ -979,6 +979,7 @@ config ARCH_ZYNQ ...@@ -979,6 +979,7 @@ config ARCH_ZYNQ
select ARM_AMBA select ARM_AMBA
select ICST select ICST
select USE_OF select USE_OF
select MULTI_IRQ_HANDLER
help help
Support for Xilinx Zynq ARM Cortex A9 Platform Support for Xilinx Zynq ARM Cortex A9 Platform
endchoice endchoice
......
...@@ -112,6 +112,7 @@ static const char *xilinx_dt_match[] = { ...@@ -112,6 +112,7 @@ static const char *xilinx_dt_match[] = {
MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
.map_io = xilinx_map_io, .map_io = xilinx_map_io,
.init_irq = xilinx_irq_init, .init_irq = xilinx_irq_init,
.handle_irq = gic_handle_irq,
.init_machine = xilinx_init_machine, .init_machine = xilinx_init_machine,
.timer = &xttcpss_sys_timer, .timer = &xttcpss_sys_timer,
.dt_compat = xilinx_dt_match, .dt_compat = xilinx_dt_match,
......
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <mach/hardware.h>
#include <asm/hardware/entry-macro-gic.S>
.macro disable_fiq .macro disable_fiq
.endm .endm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment