From patchwork Thu May 10 18:39:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 158366 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 4784DB6FA2 for ; Fri, 11 May 2012 04:42:10 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SSYH9-0005cy-0C; Thu, 10 May 2012 18:39:43 +0000 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SSYGq-0005Yr-7i for linux-arm-kernel@lists.infradead.org; Thu, 10 May 2012 18:39:24 +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 1SSYGo-00007N-Td; Thu, 10 May 2012 18:39:23 +0000 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: U2FsdGVkX1+/Y2axwwNCFd1o0wcWdBum Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.028 (F2.82; T1.34; A2.08; B3.13; Q3.13) Date: Thu, 10 May 2012 11:39:17 -0700 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 2/10] omap soc clean-up for v3.5 merge window In-Reply-To: X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.71 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.5 MISSING_MID Missing Message-Id: header Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Message-ID: Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The following changes since commit 7a8bcf067d2b11964cb83ce3d753ac2d3ab9843c: Merge branch 'devel-hwmod' into cleanup (2012-05-08 10:17:32 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-for-v3.5 for you to fetch changes up to 2c65e7440d56b3b285d1c95563b4dcce8e40dea3: GPMC: add ECC control definitions (2012-05-10 09:39:47 -0700) ---------------------------------------------------------------- Clean up to make it easier to add support for new SoCs. Note that these have a merge dependency to omap-devel-hwmod-for-v3.5 branch for the Makefile changes. ---------------------------------------------------------------- Kevin Hilman (2): ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505 ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx R Sricharan (1): ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them. Santosh Shilimkar (6): ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds. ARM: OMAP2+: Clean up wrapping multiple objects in Makefile ARM: OMAP4: Remove un-used WakeupGen register defines. ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching. ARM: All OMAP2PLUS machines use omap2 directory so just add one entry ARM: OMAP4: Reduce the static IO mapping Tarun Kanti DebBarma (1): ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore Tony Lindgren (2): Merge branch 'for_3.5/omap_misc_cleanup' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into cleanup-soc Merge branch 'cleanup-soc' into cleanup Yegor Yefremov (1): GPMC: add ECC control definitions arch/arm/Makefile | 4 +- arch/arm/mach-omap2/Makefile | 167 ++++++++++----------- arch/arm/mach-omap2/dma.c | 11 +- arch/arm/mach-omap2/gpmc.c | 30 +++- arch/arm/mach-omap2/hsmmc.c | 8 +- arch/arm/mach-omap2/id.c | 7 +- arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 8 - arch/arm/mach-omap2/io.c | 30 ---- arch/arm/mach-omap2/iomap.h | 28 ---- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +- arch/arm/mach-omap2/usb-musb.c | 2 +- arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +- arch/arm/plat-omap/dma.c | 4 +- arch/arm/plat-omap/dmtimer.c | 2 - arch/arm/plat-omap/include/plat/cpu.h | 8 + arch/arm/plat-omap/include/plat/dma.h | 5 + arch/arm/plat-omap/include/plat/dmtimer.h | 1 - 18 files changed, 137 insertions(+), 184 deletions(-)