| Message ID | E1S5kMR-0001GD-Jj@merlin.infradead.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> 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 D0788B6EEE for <incoming-imx@patchwork.ozlabs.org>; Fri, 9 Mar 2012 07:57:16 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S5kMR-0001GD-Jj; Thu, 08 Mar 2012 20:54:55 +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 1S5kLG-0000k9-1s for linux-arm-kernel@lists.infradead.org; Thu, 08 Mar 2012 20:53:42 +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 <tony@atomide.com>) id 1S5kLE-000BUt-GO; Thu, 08 Mar 2012 20:53:40 +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: U2FsdGVkX18ap4yLIoAIRZXm8D6+9OHd MIME-Version: 1.0 Content-Disposition: inline X-Mailer: MIME::Lite 3.027 (F2.77; T1.30; A2.06; B3.08; Q3.08) Date: Thu, 8 Mar 2012 12:53:29 -0800 From: Tony Lindgren <tony@atomide.com> To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net> Subject: [GIT PULL 7/7] minimal omap board updates for upcoming merge window In-Reply-To: <pull-1331240009-558004> 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.72 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: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Message-ID: <E1S5kMR-0001GD-Jj@merlin.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 |
This one contains minimal updates to existing board files so people can use the mainline kernel easier. Note that the board-omap4panda.c changes have a minor merge conflict in the ASoC tree in next/master. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linus Torvalds (1): Linux 3.3-rc6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap board Aaro Koskinen (1): ARM: OMAP: add minimal support for Nokia RM-696 Alex (1): ARM: OMAP: Add omap_reserve functionality Grazvydas Ignotas (1): ARM: OMAP: pandora: add support for backlight and poweroff Igor Grinberg (1): ARM: OMAP3: cm-t3517: add EMAC support Ilya Yanok (1): ARM: OMAP: move generic EMAC init to separate file Mircea Gherzan (1): ARM: OMAP: enable Bluetooth on the PandaBoard Uwe Kleine-Knig (1): ARM: OMAP4: board-4430sdp: don't initialize value that is never used Vladimir Zapolskiy (1): ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios arch/arm/mach-omap2/Kconfig | 3 +- arch/arm/mach-omap2/Makefile | 3 + arch/arm/mach-omap2/am35xx-emac.c | 117 ++++++++++++++++++++++++++ arch/arm/mach-omap2/am35xx-emac.h | 15 ++++ arch/arm/mach-omap2/board-4430sdp.c | 5 +- arch/arm/mach-omap2/board-am3517evm.c | 117 +------------------------- arch/arm/mach-omap2/board-cm-t3517.c | 2 + arch/arm/mach-omap2/board-omap3logic.c | 2 + arch/arm/mach-omap2/board-omap3pandora.c | 11 +++ arch/arm/mach-omap2/board-omap4panda.c | 6 ++ arch/arm/mach-omap2/board-rm680.c | 14 +++- arch/arm/mach-omap2/board-rx51-peripherals.c | 25 +++--- arch/arm/plat-omap/include/plat/uncompress.h | 1 + 13 files changed, 192 insertions(+), 129 deletions(-) create mode 100644 arch/arm/mach-omap2/am35xx-emac.c create mode 100644 arch/arm/mach-omap2/am35xx-emac.h