From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: [PATCH 2/2] omap: rx51: mark reserved memory earlier Date: Fri, 15 Oct 2010 15:46:24 +0300 Message-ID: <1287146784-5517-2-git-send-email-felipe.contreras@gmail.com> References: Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:43723 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754301Ab0JOMqx (ORCPT ); Fri, 15 Oct 2010 08:46:53 -0400 Received: by bwz15 with SMTP id 15so880148bwz.19 for ; Fri, 15 Oct 2010 05:46:44 -0700 (PDT) In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-arm , linux-omap Cc: Tomi Valkeinen , Ameya Palande , mike@compulab.co.il, Russell King , Felipe Contreras So that omap_vram_set_sdram_vram() is called before omap_vram_reserve_sdram_memblock(). 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, -- 1.7.3.1.2.g7fe2b