aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-spear
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@st.com>2012-04-16 04:26:18 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-12 15:19:28 -0400
commitf8abc080d33e69dfa2c3dd0f84c31832e2679091 (patch)
treedc01d0a82f07f3e906ad1e0ee646941de5d59483 /arch/arm/plat-spear
parenta45896bd3a4b7beb571fa704efa7c2782b791093 (diff)
SPEAr: Call clk_prepare() before calling clk_enable
With common clock framework, it is must to call clk_{un}prepare() before/after clk_{dis}enable. This patch fixes this for SPEAr timer. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Reviewed-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/plat-spear')
-rw-r--r--arch/arm/plat-spear/time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-spear/time.c b/arch/arm/plat-spear/time.c
index abb5bdecd509..1c94989d725f 100644
--- a/arch/arm/plat-spear/time.c
+++ b/arch/arm/plat-spear/time.c
@@ -219,10 +219,10 @@ void __init spear_setup_timer(void)
219 goto err_iomap; 219 goto err_iomap;
220 } 220 }
221 221
222 ret = clk_enable(gpt_clk); 222 ret = clk_prepare_enable(gpt_clk);
223 if (ret < 0) { 223 if (ret < 0) {
224 pr_err("%s:couldn't enable gpt clock\n", __func__); 224 pr_err("%s:couldn't prepare-enable gpt clock\n", __func__);
225 goto err_clk; 225 goto err_prepare_enable_clk;
226 } 226 }
227 227
228 spear_clockevent_init(); 228 spear_clockevent_init();
@@ -230,7 +230,7 @@ void __init spear_setup_timer(void)
230 230
231 return; 231 return;
232 232
233err_clk: 233err_prepare_enable_clk:
234 clk_put(gpt_clk); 234 clk_put(gpt_clk);
235err_iomap: 235err_iomap:
236 iounmap(gpt_base); 236 iounmap(gpt_base);