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

Commit 2416dc85 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'fixes-dt' into fixes

parents 62aa2b53 b755706c

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

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



#include <mach/hardware.h>

#include <asm/hardware/gic.h>

#include <asm/mach/arch.h>



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

	.init_early	= omap2420_init_early,

	.init_irq	= omap2_init_irq,

	.handle_irq	= omap2_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.timer		= &omap2_timer,

	.dt_compat	= omap242x_boards_compat,
@@ -141,6 +143,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.map_io		= omap3_map_io,

	.init_early	= omap3430_init_early,

	.init_irq	= omap3_init_irq,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap3_init,

	.timer		= &omap3_timer,

	.dt_compat	= omap3_boards_compat,
@@ -160,6 +163,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") 
	.map_io		= omap4_map_io,

	.init_early	= omap4430_init_early,

	.init_irq	= gic_init_irq,

	.handle_irq	= gic_handle_irq,

	.init_machine	= omap4_init,

	.timer		= &omap4_timer,

	.dt_compat	= omap4_boards_compat,