From patchwork Thu May 16 14:02:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 244330 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 36F6D2C00E7 for ; Fri, 17 May 2013 00:03:22 +1000 (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 1Ucylv-0008J1-9F; Thu, 16 May 2013 14:03:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ucyls-0004xh-C7; Thu, 16 May 2013 14:03:04 +0000 Received: from mail-pd0-f171.google.com ([209.85.192.171]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ucylo-0004wQ-H0 for linux-arm-kernel@lists.infradead.org; Thu, 16 May 2013 14:03:01 +0000 Received: by mail-pd0-f171.google.com with SMTP id t12so633316pdi.2 for ; Thu, 16 May 2013 07:02:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type:x-gm-message-state; bh=PnlzNGcYwaBkf6hploXi2gsDzAjcojdB9W1FUV3Eyso=; b=OlvfItr3bJfmKXrb+4D+5yAl/qxKFi1kXtO82Gu0BSKffvecqc08kot80jHnxLAdv3 b8enqd5bdL7K7vPPZbxRun4K5OhGhhOVrLNsIY7BvUaeedqZKIdin+EVBF43EPBNoLLI F7wdDGIvSWB5SyDhWKf0n2s8cylPEAIjLKLaWwHFPv3Bc165au7Ymv0FbBDeZJfM8qd4 TEn1jvlrzxQzbwLME3zNwrFoJWdcD0oCOW/qXzcie2FIJJlIvvwhTI7n2EBB/t+U0zQf 7okaXNqeEc+eQd9jJSQsFryuK9PayVaigmxo2IxAeA83tu045cvtxvVJ3MChzxIQ6tH6 2xOw== X-Received: by 10.66.144.233 with SMTP id sp9mr43590793pab.178.1368712958045; Thu, 16 May 2013 07:02:38 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPSA id nt2sm6922683pbc.17.2013.05.16.07.02.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 16 May 2013 07:02:37 -0700 (PDT) From: Kevin Hilman To: Olof Johansson Subject: Re: [GIT PULL] OMAP PM cleanups for v3.10 References: <87ehej1ena.fsf@linaro.org> <20130410181452.GG10155@atomide.com> <20130423175934.GA6728@quad.lixom.net> Date: Thu, 16 May 2013 07:02:35 -0700 In-Reply-To: <20130423175934.GA6728@quad.lixom.net> (Olof Johansson's message of "Tue, 23 Apr 2013 10:59:34 -0700") Message-ID: <87ppwrt43o.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlh3gs2MwvGE0XR2YLptesky4STbMdwPOGLsU3GlCy+KbynQ8xK+YugpaCWWuHkh9BiQ8s3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130516_100300_635070_8889EE66 X-CRM114-Status: GOOD ( 17.49 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.171 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tony Lindgren , linux-omap , arnd@arndb.de, linux-arm-kernel 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 Olof Johansson writes: > On Wed, Apr 10, 2013 at 11:14:52AM -0700, Tony Lindgren wrote: >> Hi, >> >> Added Olof to cc, I suggest Olof pull this directly as we're starting >> to run out of time. > > Hi, > > I'm terribly sorry for dropping this one on the floor, in spite of repeated > pings from Tony. :( > > If it wasn't for the fact that we're pushing back on some of the other > late submissions I'd be open to taking this, but to be fair it makes > more sense to merge it right after -rc1. The changes don't look like > they're truly critical for 3.10, and you should still be able to use > this as a base for your 3.11 changes, so hopefully this doesn't cause > too much trouble. > > So, please resend right after the merge window closes. Pull request below. It is unchanged and merges cleanly with v3.10-rc1. Kevin The following changes since commit c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0: Merge branch 'for_3.10/omap_generic_cleanup_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/cleanup-v2 (2013-03-28 14:45:31 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git tags/omap-pm-v3.10/cleanup/pm for you to fetch changes up to 705814b5ea6ff69d4da8ad581c3da5d26d1eae83: ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for OMAP5 (2013-04-09 10:53:06 -0700) ---------------------------------------------------------------- OMAP PM cleanups for v3.10 ---------------------------------------------------------------- Santosh Shilimkar (4): ARM: OMAP4: PM: Avoid expensive cpu_suspend() path for all CPU power states except off ARM: OMAP4+: PM: Consolidate MPU subsystem PM code for re-use ARM: OMAP4+: Make secondary_startup function name more consistent ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for OMAP5 arch/arm/mach-omap2/common.h | 4 +- arch/arm/mach-omap2/omap-headsmp.S | 8 ++-- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 69 +++++++++++++++++++++++++------ arch/arm/mach-omap2/omap-smp.c | 6 +-- arch/arm/mach-omap2/pm44xx.c | 58 +++++++++++++++++++++----- 5 files changed, 113 insertions(+), 32 deletions(-)