From patchwork Mon Jan 24 09:05:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 80082 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C98F81007D1 for ; Mon, 24 Jan 2011 12:03:51 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862Ab1AXBDf (ORCPT ); Sun, 23 Jan 2011 20:03:35 -0500 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.31]:10094 "EHLO VA3EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750Ab1AXBDe (ORCPT ); Sun, 23 Jan 2011 20:03:34 -0500 Received: from mail51-va3-R.bigfish.com (10.7.14.245) by VA3EHSOBE005.bigfish.com (10.7.40.25) with Microsoft SMTP Server id 14.1.225.8; Mon, 24 Jan 2011 01:03:32 +0000 Received: from mail51-va3 (localhost.localdomain [127.0.0.1]) by mail51-va3-R.bigfish.com (Postfix) with ESMTP id 1AE8B15183B8; Mon, 24 Jan 2011 01:03:32 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzbb2cKc8kzz1202hzz8275bhz2dh2a8h668h) X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:az33egw02.freescale.net; RD:az33egw02.freescale.net; EFVD:NLI Received: from mail51-va3 (localhost.localdomain [127.0.0.1]) by mail51-va3 (MessageSwitch) id 1295831011856506_14052; Mon, 24 Jan 2011 01:03:31 +0000 (UTC) Received: from VA3EHSMHS007.bigfish.com (unknown [10.7.14.248]) by mail51-va3.bigfish.com (Postfix) with ESMTP id 775FF19D0050; Mon, 24 Jan 2011 01:03:31 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by VA3EHSMHS007.bigfish.com (10.7.99.17) with Microsoft SMTP Server (TLS) id 14.1.225.8; Mon, 24 Jan 2011 01:03:30 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id p0O13OQZ005489; Sun, 23 Jan 2011 18:03:24 -0700 (MST) Received: from S2100-06.ap.freescale.net (S2100-06.ap.freescale.net [10.192.242.50]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p0O13GRd020069; Sun, 23 Jan 2011 19:03:17 -0600 (CST) From: Shawn Guo To: , , , , , , , , , , , , , , CC: Shawn Guo Subject: [PATCH v5] ARM: mxs: add initial pm support Date: Mon, 24 Jan 2011 17:05:25 +0800 Message-ID: <1295859925-2639-1-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com> References: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a very initial pm support and basically does nothing. With this pm support entry, drivers can start testing their own pm functions. Signed-off-by: Shawn Guo --- Hi Sascha, The merging conflict was fixed in this version, and you can pick it up on imx-for-2.6.39 branch now. arch/arm/mach-mxs/Makefile | 1 + arch/arm/mach-mxs/pm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-mxs/pm.c diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index df501a8..6b26f02 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -2,6 +2,7 @@ obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o obj-$(CONFIG_MXS_OCOTP) += ocotp.o +obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o diff --git a/arch/arm/mach-mxs/pm.c b/arch/arm/mach-mxs/pm.c new file mode 100644 index 0000000..fb042da --- /dev/null +++ b/arch/arm/mach-mxs/pm.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2010 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +static int mxs_suspend_enter(suspend_state_t state) +{ + switch (state) { + case PM_SUSPEND_MEM: + arch_idle(); + break; + + default: + return -EINVAL; + } + return 0; +} + +static struct platform_suspend_ops mxs_suspend_ops = { + .enter = mxs_suspend_enter, + .valid = suspend_valid_only_mem, +}; + +static int __init mxs_pm_init(void) +{ + suspend_set_ops(&mxs_suspend_ops); + return 0; +} +device_initcall(mxs_pm_init);