From patchwork Wed Dec 14 19:35:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 131461 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 E5DEB1007D6 for ; Thu, 15 Dec 2011 06:38:15 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RaucQ-0007w0-G6; Wed, 14 Dec 2011 19:35:58 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RaucK-0007vm-T9 for linux-arm-kernel@lists.infradead.org; Wed, 14 Dec 2011 19:35:55 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1RaucJ-0008WG-6R; Wed, 14 Dec 2011 19:35:51 +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: U2FsdGVkX18fbGq8E89dToco73xiS3R3 Date: Wed, 14 Dec 2011 11:35:47 -0800 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL] SoC changes for omap4470, ti814x, am33xx for v3.3 merge window Message-ID: <20111214193547.GI32251@atomide.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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 Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Arnd & Olof, Please pull support for new omap variants from: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap This adds minimal support for omap4470, am33xx and ti814x. Note that these changes do not contain mux/clock/hwmod changes so only minimal boot support is added. Also, these do not have a dependency after all to the previously pulled omap4 branch unlike what I mentioned earlier The dependency is just Russell's devel-stable at commit deee6d5359969a0ce4e2760cfd7b9f379bd5698a as most omap patches have. Regards, Tony The following changes since commit deee6d5359969a0ce4e2760cfd7b9f379bd5698a: Tony Lindgren (1): ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap soc Afzal Mohammed (2): ARM: OMAP: am33xx: Update common omap platform files ARM: OMAP: am33xx: Update common OMAP machine specific sources David Anders (1): ARM: OMAP: id: add chip id recognition for omap4430 es2.3 Hemant Pedanekar (2): ARM: OMAP: TI81XX: Prepare for addition of TI814X support ARM: OMAP: TI814X: Add cpu type macros and detection support Leonid Iziumtsev (1): ARM: OMAP: ID: Chip detection for OMAP4470 arch/arm/mach-omap2/Kconfig | 11 +++- arch/arm/mach-omap2/board-ti8168evm.c | 11 +--- arch/arm/mach-omap2/clock.c | 2 +- arch/arm/mach-omap2/clock.h | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 6 ++- arch/arm/mach-omap2/common.c | 48 +++++++++++++---- arch/arm/mach-omap2/common.h | 23 ++++++-- arch/arm/mach-omap2/control.h | 8 ++-- arch/arm/mach-omap2/id.c | 52 ++++++++++++++++--- arch/arm/mach-omap2/include/mach/debug-macro.S | 12 ++-- arch/arm/mach-omap2/io.c | 38 +++++++++++--- arch/arm/mach-omap2/irq.c | 2 +- arch/arm/mach-omap2/opp2xxx.h | 2 +- arch/arm/mach-omap2/serial.c | 6 +- arch/arm/plat-omap/Makefile | 1 - .../plat-omap/include/plat/{ti816x.h => am33xx.h} | 20 +++---- arch/arm/plat-omap/include/plat/clock.h | 4 +- arch/arm/plat-omap/include/plat/cpu.h | 56 ++++++++++++++++++++ arch/arm/plat-omap/include/plat/hardware.h | 3 +- arch/arm/plat-omap/include/plat/io.h | 12 ++++ arch/arm/plat-omap/include/plat/omap34xx.h | 2 + arch/arm/plat-omap/include/plat/serial.h | 14 +++--- .../plat-omap/include/plat/{ti816x.h => ti81xx.h} | 18 +++--- arch/arm/plat-omap/include/plat/uncompress.h | 8 ++-- 24 files changed, 267 insertions(+), 94 deletions(-) copy arch/arm/plat-omap/include/plat/{ti816x.h => am33xx.h} (53%) rename arch/arm/plat-omap/include/plat/{ti816x.h => ti81xx.h} (60%)