lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER

Browse Source 
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>
This commit is contained in:
Marc Zyngier
2011-09-06 10:23:45 +01:00
parent a83d8e27d2
commit ead31ee5ed
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@@ -366,6 +366,7 @@ config ARCH_CNS3XXX
select ARM_GIC select ARM_GIC
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select PCI_DOMAINS if PCI select PCI_DOMAINS if PCI
select MULTI_IRQ_HANDLER
help help
Support for Cavium Networks CNS3XXX platform. Support for Cavium Networks CNS3XXX platform.

2
arch/arm/mach-cns3xxx/cns3420vb.c
View File

@@ -26,6 +26,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/hardware/gic.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
@@ -201,5 +202,6 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
.map_io = cns3420_map_io, .map_io = cns3420_map_io,
.init_irq = cns3xxx_init_irq, .init_irq = cns3xxx_init_irq,
.timer = &cns3xxx_timer, .timer = &cns3xxx_timer,
.handle_irq = gic_handle_irq,
.init_machine = cns3420_init, .init_machine = cns3420_init,
MACHINE_END MACHINE_END

2
arch/arm/mach-cns3xxx/include/mach/entry-macro.S
View File

@@ -8,8 +8,6 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <asm/hardware/entry-macro-gic.S>
.macro disable_fiq .macro disable_fiq
.endm .endm