From patchwork Fri Oct 15 12:46:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 256481 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9FCkst9026429 for ; Fri, 15 Oct 2010 12:46:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755327Ab0JOMqx (ORCPT ); Fri, 15 Oct 2010 08:46:53 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=BR5/k6tfxBY31uDM5TNZthh9YOj1PTHgUliXcAR80M0=; b=usfBK35w6ROnjLunccsi/6MXOMv3QNl8T1/aACcUKhBFp5zm44W2ti+ucTlkt+YIKX STco5mLx5g/RsNNQnsinHtmeBuxKDdDIkeP61X5plpfM3hT+mRcApXYvOGNJWSHpxghh JOirr+Yd2IypYaVZtEvLpE5ju4kk3uZ+XFHJg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=pGlCQThR9duznrpRmnu3jACK0h8wOwwAooKDmAyC9xdfAxrSaS9JAOKZIGRW048kCj 5GFhFJsIYffZJHwNvN/zD/xqKywmE0zOTkMCTHsK0oH4jUOBG8YN30W8lpbOlMSro6RW dW93n2awfBjbeG5Bm+PlpTe7h5Ap1mwEw55pg= Received: by 10.204.55.135 with SMTP id u7mr695737bkg.122.1287146800781; Fri, 15 Oct 2010 05:46:40 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id d27sm2593908bkw.2.2010.10.15.05.46.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 15 Oct 2010 05:46:40 -0700 (PDT) From: Felipe Contreras To: linux-arm , linux-omap Cc: Tomi Valkeinen , Ameya Palande , mike@compulab.co.il, Russell King , 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> X-Mailer: git-send-email 1.7.3.1.2.g7fe2b In-Reply-To: References: Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 15 Oct 2010 12:46:58 +0000 (UTC) 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,