Skip to content

Commit

Permalink
ARM: zynq: convert to CONFIG_MULTI_IRQ_HANDLER
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marc Zyngier committed Nov 15, 2011
1 parent ead31ee commit 368b8e2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
1 change: 1 addition & 0 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-zynq/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-zynq/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 368b8e2

Please sign in to comment.