From patchwork Thu Nov 10 04:54:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5018 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A75C123E01 for ; Thu, 10 Nov 2011 04:55:29 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 9C522A181DF for ; Thu, 10 Nov 2011 04:55:29 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so3473983faa.11 for ; Wed, 09 Nov 2011 20:55:29 -0800 (PST) Received: by 10.152.102.138 with SMTP id fo10mr3509408lab.44.1320900929340; Wed, 09 Nov 2011 20:55:29 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.3.196 with SMTP id e4cs8565lae; Wed, 9 Nov 2011 20:55:29 -0800 (PST) Received: by 10.52.77.104 with SMTP id r8mr9905983vdw.96.1320900927392; Wed, 09 Nov 2011 20:55:27 -0800 (PST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe004.messaging.microsoft.com. [216.32.181.184]) by mx.google.com with ESMTPS id z3si5980256vdv.67.2011.11.09.20.55.26 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Nov 2011 20:55:27 -0800 (PST) Received-SPF: neutral (google.com: 216.32.181.184 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.181.184; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.184 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail68-ch1-R.bigfish.com (10.43.68.254) by CH1EHSOBE002.bigfish.com (10.43.70.52) with Microsoft SMTP Server id 14.1.225.22; Thu, 10 Nov 2011 04:55:02 +0000 Received: from mail68-ch1 (localhost.localdomain [127.0.0.1]) by mail68-ch1-R.bigfish.com (Postfix) with ESMTP id 7E678588172; Thu, 10 Nov 2011 04:55:15 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-SS: 0, X-FB-DOMAIN-IP-MATCH: fail Received: from mail68-ch1 (localhost.localdomain [127.0.0.1]) by mail68-ch1 (MessageSwitch) id 1320900885733061_31502; Thu, 10 Nov 2011 04:54:45 +0000 (UTC) Received: from CH1EHSMHS022.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.244]) by mail68-ch1.bigfish.com (Postfix) with ESMTP id ADE0A38804C; Thu, 10 Nov 2011 04:54:45 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS022.bigfish.com (10.43.70.22) with Microsoft SMTP Server (TLS) id 14.1.225.22; Thu, 10 Nov 2011 04:54:32 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.339.2; Wed, 9 Nov 2011 22:54:55 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pAA4sZAi016053; Wed, 9 Nov 2011 22:54:53 -0600 (CST) From: Richard Zhao To: CC: , , , , , , , Richard Zhao Subject: [PATCH 7/9] ARM: pm-imx5: convert to clk_prepare/clk_unprepare Date: Thu, 10 Nov 2011 12:54:12 +0800 Message-ID: <1320900854-13031-7-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org> References: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Signed-off-by: Richard Zhao --- arch/arm/mach-mx5/pm-imx5.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mx5/pm-imx5.c b/arch/arm/mach-mx5/pm-imx5.c index 98052fc..9e8cfe5 100644 --- a/arch/arm/mach-mx5/pm-imx5.c +++ b/arch/arm/mach-mx5/pm-imx5.c @@ -22,7 +22,13 @@ static struct clk *gpc_dvfs_clk; static int mx5_suspend_prepare(void) { - return clk_enable(gpc_dvfs_clk); + int ret; + ret = clk_prepare(gpc_dvfs_clk); + if (!ret) + ret = clk_enable(gpc_dvfs_clk); + if (ret) + clk_unprepare(gpc_dvfs_clk); + return ret; } static int mx5_suspend_enter(suspend_state_t state) @@ -53,6 +59,7 @@ static int mx5_suspend_enter(suspend_state_t state) static void mx5_suspend_finish(void) { clk_disable(gpc_dvfs_clk); + clk_unprepare(gpc_dvfs_clk); } static int mx5_pm_valid(suspend_state_t state)