diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-06 16:09:51 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-06 16:09:51 -0800 |
| commit | 2580390c563d3a4a6bea820588b188fe76303b5d (patch) | |
| tree | 18419de768373eeb00fb215f4924d926a67e508f /arch/arm/mach-omap2/board-generic.c | |
| parent | ad3252556f02cba81f644665ff1fd5a8aa3d97d2 (diff) | |
| parent | 9883f7c8dd21acb90697582ca331f3f8a66ac054 (diff) | |
Merge branch 'dev-dt-timer' of github.com:jonhunter/linux into omap-for-v3.8/dt
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 601ecdfb1cf9..d69018028d96 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -97,6 +97,23 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") .dt_compat = omap3_boards_compat, .restart = omap_prcm_restart, MACHINE_END + +static const char *omap3_gp_boards_compat[] __initdata = { + "ti,omap3-beagle", + NULL, +}; + +DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") + .reserve = omap_reserve, + .map_io = omap3_map_io, + .init_early = omap3430_init_early, + .init_irq = omap_intc_of_init, + .handle_irq = omap3_intc_handle_irq, + .init_machine = omap_generic_init, + .timer = &omap3_secure_timer, + .dt_compat = omap3_gp_boards_compat, + .restart = omap_prcm_restart, +MACHINE_END #endif #ifdef CONFIG_SOC_AM33XX |