projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc16b37
)
omap: rx51: mark reserved memory earlier
author
Felipe Contreras
<felipe.contreras@gmail.com>
Tue, 26 Apr 2011 09:45:28 +0000
(
02:45
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 26 Apr 2011 09:45:28 +0000
(
02:45
-0700)
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>
arch/arm/mach-omap2/board-rx51.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-omap2/board-rx51.c
b/arch/arm/mach-omap2/board-rx51.c
index
e964895
..
f8ba20a
100644
(file)
--- 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,