summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@linaro.org>2011-11-15 14:48:03 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-01 14:29:30 +0100
commitd816c6e644fd5b63fa7dbf865360db218753a212 (patch)
tree46fd8d04059ee090ca4ac3b22489f8df815ff6af /arch/arm/mach-imx
parentbac59328c8a6c7686cadb57bf2a37cf35c07deb0 (diff)
downloadlinux-d816c6e644fd5b63fa7dbf865360db218753a212.tar.gz
linux-d816c6e644fd5b63fa7dbf865360db218753a212.tar.bz2
linux-d816c6e644fd5b63fa7dbf865360db218753a212.zip
ARM: pm-imx5: add clk_prepare/clk_unprepare
It's for migrating to generic clk framework API. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/pm-imx5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index 6dc093448057..e26a9cb05ed8 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -89,7 +89,7 @@ void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode)
static int mx5_suspend_prepare(void)
{
- return clk_enable(gpc_dvfs_clk);
+ return clk_prepare_enable(gpc_dvfs_clk);
}
static int mx5_suspend_enter(suspend_state_t state)
@@ -119,7 +119,7 @@ static int mx5_suspend_enter(suspend_state_t state)
static void mx5_suspend_finish(void)
{
- clk_disable(gpc_dvfs_clk);
+ clk_disable_unprepare(gpc_dvfs_clk);
}
static int mx5_pm_valid(suspend_state_t state)