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

Commit 6b2f55d7 authored Sep 06, 2011 by Marc Zyngier

ARM: omap2plus: convert to CONFIG_MULTI_IRQ_HANDLER



Convert the omap2plus platforms to be using CONFIG_MULTI_IRQ_HANDLER.
Each machine is modified to provide either omap2_intc_handle_irq(),
omap3_intc_handle_irq() or gic_handle_irq().

This allows for a major cleanup, removing the MULTI_OMAP setup
from the interrupt path.

Tested on both Panda and IGEPv2 (single kernel image)

Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent 2db14997

arch/arm/mach-omap2/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ config ARCH_OMAP2
	depends on ARCH_OMAP2PLUS		depends on ARCH_OMAP2PLUS
	default y		default y
	select CPU_V6		select CPU_V6
			select MULTI_IRQ_HANDLER

	config ARCH_OMAP3		config ARCH_OMAP3
	bool "TI OMAP3"		bool "TI OMAP3"

arch/arm/mach-omap2/board-2430sdp.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -301,6 +301,7 @@ MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
	.map_io = omap243x_map_io,		.map_io = omap243x_map_io,
	.init_early = omap2430_init_early,		.init_early = omap2430_init_early,
	.init_irq = omap2_init_irq,		.init_irq = omap2_init_irq,
			.handle_irq = omap2_intc_handle_irq,
	.init_machine = omap_2430sdp_init,		.init_machine = omap_2430sdp_init,
	.timer = &omap2_timer,		.timer = &omap2_timer,
	MACHINE_END		MACHINE_END

arch/arm/mach-omap2/board-3430sdp.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -728,6 +728,7 @@ MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
	.map_io = omap3_map_io,		.map_io = omap3_map_io,
	.init_early = omap3430_init_early,		.init_early = omap3430_init_early,
	.init_irq = omap3_init_irq,		.init_irq = omap3_init_irq,
			.handle_irq = omap3_intc_handle_irq,
	.init_machine = omap_3430sdp_init,		.init_machine = omap_3430sdp_init,
	.timer = &omap3_timer,		.timer = &omap3_timer,
	MACHINE_END		MACHINE_END

arch/arm/mach-omap2/board-3630sdp.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -215,6 +215,7 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")
	.map_io = omap3_map_io,		.map_io = omap3_map_io,
	.init_early = omap3630_init_early,		.init_early = omap3630_init_early,
	.init_irq = omap3_init_irq,		.init_irq = omap3_init_irq,
			.handle_irq = omap3_intc_handle_irq,
	.init_machine = omap_sdp_init,		.init_machine = omap_sdp_init,
	.timer = &omap3_timer,		.timer = &omap3_timer,
	MACHINE_END		MACHINE_END

arch/arm/mach-omap2/board-4430sdp.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@

	#include <mach/hardware.h>		#include <mach/hardware.h>
	#include <mach/omap4-common.h>		#include <mach/omap4-common.h>
			#include <asm/hardware/gic.h>
	#include <asm/mach-types.h>		#include <asm/mach-types.h>
	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>
	@@ -984,6 +985,7 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
	.map_io = omap4_map_io,		.map_io = omap4_map_io,
	.init_early = omap4430_init_early,		.init_early = omap4430_init_early,
	.init_irq = gic_init_irq,		.init_irq = gic_init_irq,
			.handle_irq = gic_handle_irq,
	.init_machine = omap_4430sdp_init,		.init_machine = omap_4430sdp_init,
	.timer = &omap4_timer,		.timer = &omap4_timer,
	MACHINE_END		MACHINE_END