From patchwork Fri Dec 6 01:32:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 297511 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 81CA62C00A2 for ; Fri, 6 Dec 2013 12:32:51 +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 1VokHa-0008DN-7Q; Fri, 06 Dec 2013 01:32:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VokHX-0002ck-M3; Fri, 06 Dec 2013 01:32:39 +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 1VokHV-0002cG-D7 for linux-arm-kernel@lists.infradead.org; Fri, 06 Dec 2013 01:32:38 +0000 Received: from c-50-131-214-131.hsd1.ca.comcast.net ([50.131.214.131] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1VokHA-000EQY-4d; Fri, 06 Dec 2013 01:32:16 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+ND9tJD1B91zgn0VY6FpD1 Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.030 (F2.84; T2.04; A2.12; B3.13; Q3.13) Date: Thu, 5 Dec 2013 17:32:13 -0800 From: Tony Lindgren To: arm@kernel.org Subject: [GIT PULL] one regression fix and two more omap dt fixes against v3.13-rc2 Message-Id: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131205_203237_496815_DE21E66C X-CRM114-Status: UNSURE ( 8.17 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.3 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.3 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] 0.6 INVALID_MSGID Message-Id is not valid, according to RFC 2822 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 dc1ccc48159d63eca5089e507c82c7d22ef60839: Linux 3.13-rc2 (2013-11-29 12:57:14 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/yet-more-dt-regressions for you to fetch changes up to 341ba42e76723f2c39da7e288703896ae3d85620: ARM: OMAP2+: Fix the machine entry for am3517 (2013-12-05 16:25:30 -0800) ---------------------------------------------------------------- A rather big fix for a regression where we have dropped omap4 hwmod data earlier but are not initializing it from device tree. In addition to this fix we eventually also be fix the issues in the .dts files and drivers, but that's too intrusive for the -rc cycle and must be done later on. Also two more legacy booting vs device tree based booting fixes for am3517 that I did not notice earlier until Nishant Menon reported these to me few days ago. With these we're good to go having v3.13 working both for legacy booting and device tree based booting, and we can then go ahed and drop the legacy booting for mach-omap2 for v3.14. ---------------------------------------------------------------- Nishanth Menon (1): ARM: OMAP2+: Fix the machine entry for am3517 Tony Lindgren (2): ARM: OMAP2+: Fix overwriting hwmod data with data from device tree ARM: dts: Fix missing entries for am3517 arch/arm/boot/dts/am3517-evm.dts | 6 +-- arch/arm/boot/dts/am3517.dtsi | 63 ++++++++++++++++++++++++ arch/arm/mach-omap2/board-generic.c | 18 +++++++ arch/arm/mach-omap2/omap_hwmod.c | 98 +++++++++++++++++++++++++++++-------- 4 files changed, 162 insertions(+), 23 deletions(-) create mode 100644 arch/arm/boot/dts/am3517.dtsi