Quellcode durchsuchen

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>
Marc Zyngier vor 14 Jahren
Ursprung
Commit
368b8e2523
3 geänderte Dateien mit 2 neuen und 3 gelöschten Zeilen
  1. 1 0
      arch/arm/Kconfig
  2. 1 0
      arch/arm/mach-zynq/common.c
  3. 0 3
      arch/arm/mach-zynq/include/mach/entry-macro.S

+ 1 - 0
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

+ 1 - 0
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,

+ 0 - 3
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