From patchwork Tue Mar 6 00:53:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 144820 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 16800B6FB4 for ; Tue, 6 Mar 2012 11:55:45 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S4ien-0001nf-3p; Tue, 06 Mar 2012 00:53:37 +0000 Received: from na3sys009aog122.obsmtp.com ([74.125.149.147]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1S4iej-0001mw-L2 for linux-arm-kernel@lists.infradead.org; Tue, 06 Mar 2012 00:53:34 +0000 Received: from mail-pw0-f53.google.com ([209.85.160.53]) (using TLSv1) by na3sys009aob122.postini.com ([74.125.148.12]) with SMTP ID DSNKT1VgDDmW1lG+KtZVbUxHpXT0+0hNm3ox@postini.com; Mon, 05 Mar 2012 16:53:33 PST Received: by pbcuo1 with SMTP id uo1so3342334pbc.40 for ; Mon, 05 Mar 2012 16:53:30 -0800 (PST) Received-SPF: pass (google.com: domain of khilman@ti.com designates 10.68.202.135 as permitted sender) client-ip=10.68.202.135; Authentication-Results: mr.google.com; spf=pass (google.com: domain of khilman@ti.com designates 10.68.202.135 as permitted sender) smtp.mail=khilman@ti.com Received: from mr.google.com ([10.68.202.135]) by 10.68.202.135 with SMTP id ki7mr49118170pbc.158.1330995210442 (num_hops = 1); Mon, 05 Mar 2012 16:53:30 -0800 (PST) Received: by 10.68.202.135 with SMTP id ki7mr42172666pbc.158.1330995210354; Mon, 05 Mar 2012 16:53:30 -0800 (PST) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id m5sm14677524pbo.69.2012.03.05.16.53.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Mar 2012 16:53:29 -0800 (PST) From: Kevin Hilman To: Tony Lindgren Subject: [GIT PULL] ARM: OMAP: PM cleanups for v3.4 Organization: Texas Instruments, Inc. Date: Mon, 05 Mar 2012 16:53:29 -0800 Message-ID: <87mx7uh7na.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkETuHYZj+AgbrJ+EjyJYgsYKYvK80foL/QucVaczU5iZaDK44pqSeD2pOEzKNRNdNU3lUn X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.147 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Paul Walmsley , linux-omap , Jean Pihet , linux-arm-kernel 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 Tony, Please pull the following PM related cleanups for v3.4. Note that due to conflicts with changes from both your cleanup branch and your hsmmc branch, I created a merge base by starting at 'cleanup' and merging hsmmc, and basing this series on top. Let me know if you want some other baseline for this series. Kevin The following changes since commit 015f1e4297ad32f83251f3f4cee2389ce5516e9e: Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base (2012-03-05 15:37:04 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.4/cleanup/pm for you to fetch changes up to 1416408d31236dc2a80d269aa23ffa93aa01e833: ARM: OMAP2+: PM: share some suspend-related functions across OMAP2, 3, 4 (2012-03-05 16:01:19 -0800) ---------------------------------------------------------------- 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 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(-)