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

Commit b755706c authored by Benoit Cousson's avatar Benoit Cousson Committed by Tony Lindgren
Browse files

ARM: OMAP2+: board-generic: Add missing handle_irq callbacks 



The following commit: 6b2f55d7,
is adding the support for the CONFIG_MULTI_IRQ_HANDLER but did
not update all the machine descriptors supported in the DT
board-generic.c file.
It thus break the DT boot on OMAP3 and OMAP4 boards.

Add the proper handle_irq callbacks for OMAP3 and OMAP4 generic
machine descriptors.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent deee6d53

arch/arm/mach-omap2/board-generic.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/i2c/twl.h>

#include <linux/i2c/twl.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>





#include <plat/board.h>

#include <plat/board.h>
@@ -103,6 +104,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") 
	.map_io		= omap242x_map_io,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_early	= omap2420_init_early,

	.init_irq	= omap2_init_irq,

	.init_irq	= omap2_init_irq,

	.handle_irq	= omap2_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_machine	= omap_generic_init,

	.timer		= &omap2_timer,

	.timer		= &omap2_timer,

	.dt_compat	= omap242x_boards_compat,

	.dt_compat	= omap242x_boards_compat,
@@ -140,6 +142,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.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	= omap3_init,

	.init_machine	= omap3_init,

	.timer		= &omap3_timer,

	.timer		= &omap3_timer,

	.dt_compat	= omap3_boards_compat,

	.dt_compat	= omap3_boards_compat,
@@ -158,6 +161,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") 
	.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	= omap4_init,

	.init_machine	= omap4_init,

	.timer		= &omap4_timer,

	.timer		= &omap4_timer,

	.dt_compat	= omap4_boards_compat,

	.dt_compat	= omap4_boards_compat,