From patchwork Fri Feb 14 17:50:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 320508 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 758572C0096 for ; Sat, 15 Feb 2014 04:52:04 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEMv7-0006m4-W1; Fri, 14 Feb 2014 17:51:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEMv5-0000IE-K4; Fri, 14 Feb 2014 17:51:23 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEMv2-0000Hj-Iz for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2014 17:51:21 +0000 Received: from 99-127-230-128.lightspeed.sntcca.sbcglobal.net ([99.127.230.128] helo=atomide.com) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.72) (envelope-from ) id 1WEMuf-0005lU-Tx; Fri, 14 Feb 2014 17:50:58 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 99.127.230.128 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18SvTSBCCI2AxSe28DhdPXa Date: Fri, 14 Feb 2014 09:50:43 -0800 From: Tony Lindgren To: arm@kernel.org Subject: [GIT PULL] omap fixes against v3.14-rc1 Message-ID: <20140214175042.GD21592@atomide.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140214_125120_643903_5E6EBF87 X-CRM114-Status: GOOD ( 10.95 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -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.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" 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 38dbfb59d1175ef458d006556061adeaa8751b72: Linus 3.14-rc1 (2014-02-02 16:42:13 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/fixes-against-rc1 for you to fetch changes up to 8842446ac74263f1330f46e11ed649e2b0ed6545: Documentation: dt: OMAP: Update Overo/Tobi (2014-02-14 08:37:53 -0800) ---------------------------------------------------------------- Fixes for omaps, mostly to deal with the 34xx vs 36xx SoC configuration for overo boards. ---------------------------------------------------------------- Aaro Koskinen (3): ARM: OMAP1: nokia770: enable tahvo-usb ARM: dts: N9/N950: fix boot hang with 3.14-rc1 ARM: dts: N900: add missing compatible property Florian Vaussard (4): ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo ARM: dts: omap3-tobi: Use the correct vendor prefix ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi Documentation: dt: OMAP: Update Overo/Tobi Marek Belisko (2): ARM: dts: omap3-gta04: Add EOC irq gpio line handling. ARM: dts: omap3-gta04: Fix mmc1 properties. NeilBrown (1): ARM: dts: omap3-gta04: Fix 'aux' gpio key flags. Nishanth Menon (1): ARM: OMAP2+: add missing ARCH_HAS_OPP Paul Bolle (2): ARM: OMAP2+: Remove MACH_NOKIA_N800 ARM: OMAP2+: Remove legacy macros for zoom platforms Pekon Gupta (2): ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module Peter Ujfalusi (2): ARM: DTS: am335x-evmsk: Correct audio clock frequency ARM: dts: am335x-evmsk: Fix mmc1 support .../devicetree/bindings/arm/omap/omap.txt | 2 +- arch/arm/boot/dts/Makefile | 3 ++- arch/arm/boot/dts/am335x-evmsk.dts | 11 ++++++++++- arch/arm/boot/dts/omap3-gta04.dts | 6 ++++-- arch/arm/boot/dts/omap3-n9.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 4 ++-- arch/arm/boot/dts/omap3-n950.dts | 2 +- arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 22 ++++++++++++++++++++++ ...omap3-tobi.dts => omap3-overo-tobi-common.dtsi} | 3 --- arch/arm/boot/dts/omap3-overo-tobi.dts | 22 ++++++++++++++++++++++ arch/arm/boot/dts/omap3-overo.dtsi | 3 --- arch/arm/mach-omap1/board-nokia770.c | 1 + arch/arm/mach-omap2/Kconfig | 8 ++++---- arch/arm/mach-omap2/gpmc.c | 4 ++-- arch/arm/mach-omap2/io.c | 9 --------- 15 files changed, 72 insertions(+), 30 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobi.dts rename arch/arm/boot/dts/{omap3-tobi.dts => omap3-overo-tobi-common.dtsi} (94%) create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dts