ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER
authorMarc Zyngier <marc.zyngier@arm.com>
Tue, 6 Sep 2011 09:23:45 +0000 (10:23 +0100)
committerMarc Zyngier <marc.zyngier@arm.com>
Tue, 15 Nov 2011 18:14:02 +0000 (18:14 +0000)
Convert the cns3xxx platform to be using the gic_handle_irq
function as its primary interrupt handler.

Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
arch/arm/Kconfig
arch/arm/mach-cns3xxx/cns3420vb.c
arch/arm/mach-cns3xxx/include/mach/entry-macro.S

index d897255bcdf5e774027fcb532a2b659e8769482d..21644caeb29bfa6e45e9723f6b0ca8af1dc23883 100644 (file)
@@ -366,6 +366,7 @@ config ARCH_CNS3XXX
        select ARM_GIC
        select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
+       select MULTI_IRQ_HANDLER
        help
          Support for Cavium Networks CNS3XXX platform.
 
index 55f7b4b08ab906822cf11b8db544b4ba64d0872b..594852fe24cc1dfe517e904e383cc677c73a819e 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
+#include <asm/hardware/gic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
@@ -201,5 +202,6 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
        .map_io         = cns3420_map_io,
        .init_irq       = cns3xxx_init_irq,
        .timer          = &cns3xxx_timer,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = cns3420_init,
 MACHINE_END
index d87bfc397d39859d01817c016e8c8b4aceab72d3..01c57df5f716b3890a9f380cdb258ba37bcf4629 100644 (file)
@@ -8,8 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/hardware/entry-macro-gic.S>
-
                .macro  disable_fiq
                .endm