From patchwork Mon Dec 19 20:00:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 132305 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 6ECC8B6FEB for ; Tue, 20 Dec 2011 07:04: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 1RcjOK-0004jo-6Q; Mon, 19 Dec 2011 20:00:56 +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 1RcjOD-0004ja-PR for linux-arm-kernel@lists.infradead.org; Mon, 19 Dec 2011 20:00:53 +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 1RcjOC-000HBR-Hd; Mon, 19 Dec 2011 20:00:48 +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: U2FsdGVkX1+sAjneC9NPph0IP+9xcVQ/ Date: Mon, 19 Dec 2011 12:00:46 -0800 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL] omap prcm changes for v3.3 merge window Message-ID: <20111219200046.GS6464@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 omap prcm changes from: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap prcm These changes adds support for PRCM (Power, Reset, Clock, Module) chained interrupt handling. This will eventually allow us to start making PM parts into driver modules and move them out of arch/arm. These are also needed for the serial port runtime PM patches that I'll post a pull request for after this. Note that these have a slight dependency to the previously merged omap4 branch so it would produce a minor merge conflict if based on something earlier. However, the following uart branch has a dependency to both omap4 branch and this branch, so I've based this on omap4 branch also. Regards, Tony The following changes since commit 4c89aad9f4803875f7065e825badc9ba61922091: Tony Lindgren (1): Merge branch 'for_3.3/pm/omap4-mpuss' of git://git.kernel.org/.../khilman/linux-omap-pm into omap4 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap prcm Govindraj R (1): ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup Paul Walmsley (2): ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier Rajendra Nayak (1): ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init Tero Kristo (6): ARM: OMAP: PRCM: add support for chain interrupt handler ARM: OMAP: PRCM: add suspend prepare / finish support ARM: OMAP2+: mux: add support for PAD wakeup interrupts ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad ARM: OMAP3: pm: use prcm chain handler ARM: OMAP4: PRM: use PRCM interrupt handler Tony Lindgren (1): Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm arch/arm/mach-omap2/Makefile | 3 +- arch/arm/mach-omap2/mux.c | 89 +++++++- arch/arm/mach-omap2/omap_hwmod.c | 125 ++++++++++- arch/arm/mach-omap2/pm34xx.c | 115 ++++------ arch/arm/mach-omap2/prcm-common.h | 75 ++++++- arch/arm/mach-omap2/prm2xxx_3xxx.c | 97 ++++++++- arch/arm/mach-omap2/prm2xxx_3xxx.h | 9 +- arch/arm/mach-omap2/prm44xx.c | 116 ++++++++++ arch/arm/mach-omap2/prm44xx.h | 8 +- arch/arm/mach-omap2/prm_common.c | 320 ++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/omap_hwmod.h | 6 + 11 files changed, 884 insertions(+), 79 deletions(-) create mode 100644 arch/arm/mach-omap2/prm_common.c