diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2011-04-26 11:45:28 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-04-26 11:45:28 +0200 |
| commit | 26a064d5246e8ac51241d6ec2792aebf24f3b41a (patch) | |
| tree | bc1c811ad0b3af580b5c74bee1259846804a44ac /arch/arm/mach-omap2/board-rx51.c | |
| parent | OMAP3: l3: fix for "irq 10: nobody cared" message (diff) | |
| download | linux-26a064d5246e8ac51241d6ec2792aebf24f3b41a.tar.xz linux-26a064d5246e8ac51241d6ec2792aebf24f3b41a.zip | |
omap: rx51: mark reserved memory earlier
So that omap_vram_set_sdram_vram() is called before
omap_vram_reserve_sdram_memblock().
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index e964895b80e8..f8ba20a14e62 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -141,14 +141,19 @@ static void __init rx51_init(void) static void __init rx51_map_io(void) { omap2_set_globals_3xxx(); - rx51_video_mem_init(); omap34xx_map_common_io(); } +static void __init rx51_reserve(void) +{ + rx51_video_mem_init(); + omap_reserve(); +} + MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") /* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */ .boot_params = 0x80000100, - .reserve = omap_reserve, + .reserve = rx51_reserve, .map_io = rx51_map_io, .init_early = rx51_init_early, .init_irq = omap_init_irq, |