From: richard.zhao@linaro.org (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/9] ARM: pm-imx5: convert to clk_prepare/clk_unprepare
Date: Thu, 10 Nov 2011 12:54:12 +0800 [thread overview]
Message-ID: <1320900854-13031-7-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1320900854-13031-1-git-send-email-richard.zhao@linaro.org>
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
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)
--
1.7.5.4
next prev parent reply other threads:[~2011-11-10 4:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 4:54 [PATCH 1/9] ARM: mxc: time: convert to clk_prepare/clk_unprepare Richard Zhao
2011-11-10 4:54 ` [PATCH 2/9] ARM: mxc: ahci: " Richard Zhao
2011-11-10 4:54 ` [PATCH 3/9] ARM: mxc: pwm: " Richard Zhao
2011-11-10 4:54 ` [PATCH 4/9] ARM: mxc: epit: " Richard Zhao
2011-11-10 4:54 ` [PATCH 5/9] ARM: mxc: arch_reset: " Richard Zhao
2011-11-10 4:54 ` [PATCH 6/9] ARM: mxc: audmux-v2: " Richard Zhao
2011-11-10 4:54 ` Richard Zhao [this message]
2011-11-10 4:54 ` [PATCH 8/9] ARM: mx31moboard: " Richard Zhao
2011-11-10 4:54 ` [PATCH 9/9] ARM: mxs: " Richard Zhao
2011-11-10 8:03 ` [PATCH 1/9] ARM: mxc: time: " Sascha Hauer
2011-11-10 8:18 ` Richard Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320900854-13031-7-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).