From mboxrd@z Thu Jan 1 00:00:00 1970 From: tomi.valkeinen@nokia.com (Tomi Valkeinen) Date: Fri, 12 Nov 2010 15:28:12 +0200 Subject: [PATCH 2/2] omap: rx51: mark reserved memory earlier In-Reply-To: <1287146784-5517-2-git-send-email-felipe.contreras@gmail.com> References: <1287146784-5517-2-git-send-email-felipe.contreras@gmail.com> Message-ID: <1289568492.3297.277.camel@tubuntu> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On Fri, 2010-10-15 at 14:46 +0200, ext Felipe Contreras wrote: > So that omap_vram_set_sdram_vram() is called before > omap_vram_reserve_sdram_memblock(). Is this still valid after the latest memblock stuff? I presume it is. I'm not able to test this, and you said you didn't test it, so I'm a bit uneasy about applying =). Tomi > > Signed-off-by: Felipe Contreras > --- > 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 a58e8cb..861079b 100644 > --- a/arch/arm/mach-omap2/board-rx51.c > +++ b/arch/arm/mach-omap2/board-rx51.c > @@ -144,17 +144,22 @@ 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 */ > .phys_io = 0x48000000, > .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, > .boot_params = 0x80000100, > .map_io = rx51_map_io, > - .reserve = omap_reserve, > + .reserve = rx51_reserve, > .init_irq = rx51_init_irq, > .init_machine = rx51_init, > .timer = &omap_timer,