| Submitter | Tony Lindgren |
|---|---|
| Date | March 8, 2012, 8:53 p.m. |
| Message ID | <E1S5kLc-0000pm-QM@merlin.infradead.org> |
| Download | mbox |
| Permalink | /patch/145622/ |
| 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 435BFB6F9D for <incoming-imx@patchwork.ozlabs.org>; Fri, 9 Mar 2012 07:56:30 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S5kLc-0000pm-QM; Thu, 08 Mar 2012 20:54:04 +0000 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1S5kLB-0000iT-1g for linux-arm-kernel@lists.infradead.org; Thu, 08 Mar 2012 20:53:37 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from <tony@atomide.com>) id 1S5kL9-00048A-LV; Thu, 08 Mar 2012 20:53:35 +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: U2FsdGVkX1+xocwffS1oVsDQDi6Vg7M5 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 3/7] PM clean-up for the 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.71 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: <E1S5kLc-0000pm-QM@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 contains PM clean-up for the upcoming merge window. As this was conflicting with both already queued cleanup and hsmmc in fixes-non-critical branches, Kevin based the series on a merge of the two. Suggest pulling this into cleanup, this makes cleanup depend on fixes-non-critical, which I believe already the case. The following changes since commit 015f1e4297ad32f83251f3f4cee2389ce5516e9e: Kevin Hilman (1): Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap cleanup-pm Jean Pihet (1): ARM: OMAP2+: PM debug: fix the use of debugfs_create_* API Kevin Hilman (1): ARM: OMAP: omap_device: remove omap_device_parent Paul Walmsley (5): ARM: OMAP3: PM: remove superfluous calls to pwrdm_clear_all_prev_pwrst() ARM: OMAP2+: PM: clean up omap_set_pwrdm_state() ARM: OMAP2+: PM: share clkdms_setup() across OMAP2, 3, 4 ARM: OMAP2+: omap_device: call all suspend, resume callbacks when OMAP_DEVICE_NO_IDLE_ON_SUSPEND is set ARM: OMAP2+: PM: share some suspend-related functions across OMAP2, 3, 4 Tony Lindgren (1): Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into cleanup-pm arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 - arch/arm/mach-omap2/pm-debug.c | 6 +- arch/arm/mach-omap2/pm.c | 113 ++++++++++++++++++++----- arch/arm/mach-omap2/pm.h | 2 + arch/arm/mach-omap2/pm24xx.c | 75 ++--------------- arch/arm/mach-omap2/pm34xx.c | 74 +---------------- arch/arm/mach-omap2/pm44xx.c | 57 +------------ arch/arm/plat-omap/include/plat/omap_device.h | 2 +- arch/arm/plat-omap/omap-pm-noop.c | 2 +- arch/arm/plat-omap/omap_device.c | 24 ++---- 10 files changed, 118 insertions(+), 239 deletions(-)