From patchwork Wed Dec 28 14:21:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 133439 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 E7434B6FC2 for ; Thu, 29 Dec 2011 01:10:18 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RfuAo-00036h-OY; Wed, 28 Dec 2011 14:08:07 +0000 Received: from tx2ehsobe003.messaging.microsoft.com ([65.55.88.13] helo=TX2EHSOBE006.bigfish.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RfuAl-00036L-8t for linux-arm-kernel@lists.infradead.org; Wed, 28 Dec 2011 14:08:03 +0000 Received: from mail106-tx2-R.bigfish.com (10.9.14.241) by TX2EHSOBE006.bigfish.com (10.9.40.26) with Microsoft SMTP Server id 14.1.225.23; Wed, 28 Dec 2011 14:07:39 +0000 Received: from mail106-tx2 (localhost [127.0.0.1]) by mail106-tx2-R.bigfish.com (Postfix) with ESMTP id C3A631801DF; Wed, 28 Dec 2011 14:08:10 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zz936eKzz1202hzz8275dhz2dh2a8h668h839h944h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail106-tx2 (localhost.localdomain [127.0.0.1]) by mail106-tx2 (MessageSwitch) id 1325081288252222_18145; Wed, 28 Dec 2011 14:08:08 +0000 (UTC) Received: from TX2EHSMHS023.bigfish.com (unknown [10.9.14.239]) by mail106-tx2.bigfish.com (Postfix) with ESMTP id 70E02680053; Wed, 28 Dec 2011 14:08:05 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS023.bigfish.com (10.9.99.123) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 28 Dec 2011 14:07:33 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.355.3; Wed, 28 Dec 2011 08:07:53 -0600 Received: from S2100-06.ap.freescale.net (S2100-06.ap.freescale.net [10.192.242.125]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pBSE7pTl023261; Wed, 28 Dec 2011 08:07:51 -0600 (CST) Date: Wed, 28 Dec 2011 22:21:35 +0800 From: Shawn Guo To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL] imx: pm for 3.3 Message-ID: <20111228142134.GC10881@S2100-06.ap.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com 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 [65.55.88.13 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Sascha Hauer , 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 the following imx/pm changes for 3.3. Regards, Shawn The following changes since commit 5f0a6e2d503896062f641639dacfe5055c2f593b: Linux 3.2-rc7 (2011-12-23 21:51:06 -0800) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git imx/pm Eric Miao (2): ARM: imx6q: build pm code only when CONFIG_PM selected ARM: imx6q: resume PL310 only when CACHE_L2X0 defined Hui Wang (1): ARM: mx5: use generic irq chip pm interface for pm functions on arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/Makefile | 6 ++++- arch/arm/mach-imx/head-v7.S | 15 ++++++++--- arch/arm/mach-imx/pm-imx6q.c | 2 + arch/arm/mach-mx5/mm.c | 19 ++++++++++++++- arch/arm/mach-mx5/system.c | 3 -- arch/arm/plat-mxc/include/mach/common.h | 8 +++++- arch/arm/plat-mxc/include/mach/mxc.h | 2 +- arch/arm/plat-mxc/tzic.c | 40 ++++++++++++++++++++++-------- 9 files changed, 74 insertions(+), 22 deletions(-)