summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/clock.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-20 13:50:11 +0800
committerShawn Guo <shawn.guo@linaro.org>2011-12-28 21:26:07 +0800
commitae68f7af05dbce25889ab10b302fba927dcdb295 (patch)
treead32e84db139482901f754c16a210540a9548af3 /arch/arm/mach-mxs/clock.c
parent42c5d52f2bbf68add2d7a6982753993e0c75a119 (diff)
downloadlinux-3.10-ae68f7af05dbce25889ab10b302fba927dcdb295.tar.gz
linux-3.10-ae68f7af05dbce25889ab10b302fba927dcdb295.tar.bz2
linux-3.10-ae68f7af05dbce25889ab10b302fba927dcdb295.zip
ARM: mxs: convert platform code to clk_prepare/clk_unprepare
The patch converts mxs platform code to clk_prepare/clk_unprepare by using helper functions clk_prepare_enable/clk_disable_unprepare. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/clock.c')
-rw-r--r--arch/arm/mach-mxs/clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/clock.c b/arch/arm/mach-mxs/clock.c
index a7093c88e6a..755eec0b5a8 100644
--- a/arch/arm/mach-mxs/clock.c
+++ b/arch/arm/mach-mxs/clock.c
@@ -166,7 +166,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
return ret;
if (clk->usecount)
- clk_enable(parent);
+ clk_prepare_enable(parent);
mutex_lock(&clocks_mutex);
ret = clk->set_parent(clk, parent);