From patchwork Mon Oct 24 09:17:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 121302 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AA284B6F83 for ; Mon, 24 Oct 2011 20:17:31 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RIGeg-0002BE-AW; Mon, 24 Oct 2011 09:17:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RIGeg-0001kE-2V; Mon, 24 Oct 2011 09:17:14 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RIGeb-0001jm-2c for linux-arm-kernel@lists.infradead.org; Mon, 24 Oct 2011 09:17:10 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1RIGeZ-000DCa-Gq; Mon, 24 Oct 2011 09:17:07 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18YbfSvSQqNIZ2qGLPGavrh Date: Mon, 24 Oct 2011 02:17:04 -0700 From: Tony Lindgren To: Arnd Bergmann Subject: [GIT PULL] pending DT patches and cleanup for map_io for v3.2 merge window Message-ID: <20111024091704.GF31337@atomide.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111024_051709_208487_D51FAD9A X-CRM114-Status: GOOD ( 13.18 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] Cc: linux-omap@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org, Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Arnd, As discussed in the ARM kernel meeting yesterday, here's are the pending omap things to pull for v3.2 merge window. These would be nice to get still in as other people's work such as Nico's map_io changes need #2 below. 1. Initial DT support posted few weeks ago Please see the earlier pull request at: http://lkml.org/lkml/2011/10/4/441 2. Cleanup for map_io posted few weeks ago This depends on the #1 above, and also requires the ioremap_exec patch. Russell said he has applied into devel-stable (But not pushed out yet?). When you have the ioremap_exec patch from Russell, please pull this from: git://github.com/tmlind/linux.git sram-map-io Pull request against #1 attached below. Regards, Tony The following changes since commit 3ae3e253db7385238dd9d6c67c085afa3e770a56: Tony Lindgren (1): Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt are available in the git repository at: git://github.com/tmlind/linux.git sram-map-io Tony Lindgren (6): ARM: OMAP1: Use generic map_io, init_early and init_irq ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done ARM: OMAP: Remove calls to SRAM allocations for framebuffer ARM: OMAP: Map SRAM later on with ioremap_exec() ARM: OMAP: Move set_globals initialization to happen in init_early ARM: OMAP: Warn if omap_ioremap is called before SoC detection arch/arm/mach-omap1/board-ams-delta.c | 16 +--- arch/arm/mach-omap1/board-fsample.c | 76 +++++++++--------- arch/arm/mach-omap1/board-generic.c | 16 +--- arch/arm/mach-omap1/board-h2.c | 16 +--- arch/arm/mach-omap1/board-h3.c | 16 +--- arch/arm/mach-omap1/board-htcherald.c | 12 +-- arch/arm/mach-omap1/board-innovator.c | 36 ++++----- arch/arm/mach-omap1/board-nokia770.c | 34 +++----- arch/arm/mach-omap1/board-osk.c | 16 +--- arch/arm/mach-omap1/board-palmte.c | 16 +--- arch/arm/mach-omap1/board-palmtt.c | 16 +--- arch/arm/mach-omap1/board-palmz71.c | 18 +---- arch/arm/mach-omap1/board-perseus2.c | 75 +++++++++--------- arch/arm/mach-omap1/board-sx1.c | 17 +--- arch/arm/mach-omap1/board-voiceblue.c | 16 +--- arch/arm/mach-omap1/devices.c | 3 + arch/arm/mach-omap1/io.c | 57 ++++++-------- arch/arm/mach-omap2/board-omap3beagle.c | 7 +-- arch/arm/mach-omap2/board-ti8168evm.c | 1 - arch/arm/mach-omap2/common.c | 50 ++++++------ arch/arm/mach-omap2/control.c | 16 +--- arch/arm/mach-omap2/io.c | 127 +++++++++++++++--------------- arch/arm/mach-omap2/io.h | 7 -- arch/arm/mach-omap2/omap-smp.c | 7 +- arch/arm/mach-omap2/prcm.c | 19 ++--- arch/arm/mach-omap2/sdrc.c | 13 +-- arch/arm/plat-omap/include/plat/common.h | 17 +++-- arch/arm/plat-omap/include/plat/io.h | 29 ++++++- arch/arm/plat-omap/io.c | 10 +++ arch/arm/plat-omap/sram.c | 85 +++++--------------- 30 files changed, 335 insertions(+), 509 deletions(-)