From patchwork Wed May 26 21:40:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 102513 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4QLf6jU010367 for ; Wed, 26 May 2010 21:41:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754017Ab0EZVkz (ORCPT ); Wed, 26 May 2010 17:40:55 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:55873 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753601Ab0EZVky (ORCPT ); Wed, 26 May 2010 17:40:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:From:To:Cc:Subject: Message-ID:References:MIME-Version:Content-Type:In-Reply-To: Sender; bh=YAFTM/kRMw9DyOhH037YM0/bRmuw+6R4am8YRB1jrmw=; b=YD4xI oZvyS+trPapi87zZUxIk7ieiYDkX+vidoXAou1OiEk3utWjI/uvAuUylGzEQZkgZ 3tqQbbFwx3uMzmgqpDeBw3PJXer2Yo01OWIbem03mOka4riIXde4jRkP8CYkmhxV ew9l4LSeZ80WqUVW9oOy8RrJeiC21beTPnYkes= Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1OHOLA-0004Ut-Im; Wed, 26 May 2010 22:40:41 +0100 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.69) (envelope-from ) id 1OHOL8-0004ZC-7v; Wed, 26 May 2010 22:40:38 +0100 Date: Wed, 26 May 2010 22:40:37 +0100 From: Russell King - ARM Linux To: Tony Lindgren Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Tomi Valkeinen Subject: Re: [RFC] Initial attempt to make ARM use LMB Message-ID: <20100526214037.GB16418@n2100.arm.linux.org.uk> References: <20100325233248.GM24984@n2100.arm.linux.org.uk> <20100522215848.GB29889@n2100.arm.linux.org.uk> <20100526004418.GM9645@atomide.com> <20100526075059.GA25435@n2100.arm.linux.org.uk> <20100526135128.GN9645@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100526135128.GN9645@atomide.com> User-Agent: Mutt/1.5.19 (2009-01-05) 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 (demeter.kernel.org [140.211.167.41]); Wed, 26 May 2010 21:41:07 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 3bd956f..e3a42d1 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_343x(); - 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,