aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2011-12-07 14:47:40 -0500
committerTony Lindgren <tony@atomide.com>2011-12-07 14:47:40 -0500
commitb755706cd726e5d465c28c2cd64c618419034981 (patch)
tree6689538de5a166422bae94ad5b646bf90ff00eef /arch/arm
parentdeee6d5359969a0ce4e2760cfd7b9f379bd5698a (diff)
ARM: OMAP2+: board-generic: Add missing handle_irq callbacks
The following commit: 6b2f55d7851aa358d3a99cff344c560c4967f042, 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: Benoit Cousson <b-cousson@ti.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-generic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 63b54163b993..e493877957c9 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -17,6 +17,7 @@
17#include <linux/i2c/twl.h> 17#include <linux/i2c/twl.h>
18 18
19#include <mach/hardware.h> 19#include <mach/hardware.h>
20#include <asm/hardware/gic.h>
20#include <asm/mach/arch.h> 21#include <asm/mach/arch.h>
21 22
22#include <plat/board.h> 23#include <plat/board.h>
@@ -103,6 +104,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
103 .map_io = omap242x_map_io, 104 .map_io = omap242x_map_io,
104 .init_early = omap2420_init_early, 105 .init_early = omap2420_init_early,
105 .init_irq = omap2_init_irq, 106 .init_irq = omap2_init_irq,
107 .handle_irq = omap2_intc_handle_irq,
106 .init_machine = omap_generic_init, 108 .init_machine = omap_generic_init,
107 .timer = &omap2_timer, 109 .timer = &omap2_timer,
108 .dt_compat = omap242x_boards_compat, 110 .dt_compat = omap242x_boards_compat,
@@ -140,6 +142,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
140 .map_io = omap3_map_io, 142 .map_io = omap3_map_io,
141 .init_early = omap3430_init_early, 143 .init_early = omap3430_init_early,
142 .init_irq = omap3_init_irq, 144 .init_irq = omap3_init_irq,
145 .handle_irq = omap3_intc_handle_irq,
143 .init_machine = omap3_init, 146 .init_machine = omap3_init,
144 .timer = &omap3_timer, 147 .timer = &omap3_timer,
145 .dt_compat = omap3_boards_compat, 148 .dt_compat = omap3_boards_compat,
@@ -158,6 +161,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
158 .map_io = omap4_map_io, 161 .map_io = omap4_map_io,
159 .init_early = omap4430_init_early, 162 .init_early = omap4430_init_early,
160 .init_irq = gic_init_irq, 163 .init_irq = gic_init_irq,
164 .handle_irq = gic_handle_irq,
161 .init_machine = omap4_init, 165 .init_machine = omap4_init,
162 .timer = &omap4_timer, 166 .timer = &omap4_timer,
163 .dt_compat = omap4_boards_compat, 167 .dt_compat = omap4_boards_compat,