From patchwork Tue Oct 9 18:46:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 190409 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 5E0172C00B2 for ; Wed, 10 Oct 2012 05:49:05 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLepN-0002ls-Sf; Tue, 09 Oct 2012 18:46:50 +0000 Received: from mho-04-ewr.mailhop.org ([204.13.248.74] helo=mho-02-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TLep8-0002kO-MT for linux-arm-kernel@lists.infradead.org; Tue, 09 Oct 2012 18:46:35 +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 1TLep5-000574-IA; Tue, 09 Oct 2012 18:46:31 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 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/L1PKi6wdTpM7M8/+dU/Tq Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.028 (F2.82; T1.35; A2.09; B3.13; Q3.13) Date: Tue, 9 Oct 2012 11:46:26 -0700 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 2/5] omap hwmod and clock fixes for v3.7-rc1 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.74 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 0e51793e162ca432fc5f04178cf82b80a92c2659: Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (2012-10-07 21:20:57 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3 for you to fetch changes up to eb20f31f6e7d3ac19738e5a45df9b09b25381e73: Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock (2012-10-09 11:07:29 -0700) ---------------------------------------------------------------- >From Paul Walmsley : Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch integration issues, and bugs after the arm-soc merges. ---------------------------------------------------------------- Jon Hunter (2): ARM: OMAP2+: hwmod data: Fix PMU interrupt definitions ARM: OMAP3: fix workaround for EMU clockdomain Paul Walmsley (2): ARM: OMAP: omap3evm: fix new sparse warning ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling Tony Lindgren (1): Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock Vaibhav Hiremath (1): ARM: am33xx: clk: Update clkdev table to add mcasp alias arch/arm/mach-omap2/board-omap3evm.c | 3 +- arch/arm/mach-omap2/clock33xx_data.c | 2 + arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 44 ++++++++++---------- arch/arm/mach-omap2/omap_hwmod.c | 31 ++++++++++++-- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- 6 files changed, 54 insertions(+), 30 deletions(-)