Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ead31ee5 authored Sep 06, 2011 by Marc Zyngier

ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER



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>

parent a83d8e27

arch/arm/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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.

arch/arm/mach-cns3xxx/cns3420vb.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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

arch/arm/mach-cns3xxx/include/mach/entry-macro.S

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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