From: Viresh Kumar <viresh.kumar@st.com>
Date: Mon, 16 Apr 2012 08:26:18 +0000 (+0530)
Subject: SPEAr: Call clk_prepare() before calling clk_enable
X-Git-Tag: v3.5-rc1~71^2~2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8abc080d33e69dfa2c3dd0f84c31832e2679091;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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>
---

diff --git a/arch/arm/plat-spear/time.c b/arch/arm/plat-spear/time.c
index abb5bde..1c94989 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)
 		goto err_iomap;
 	}
 
-	ret = clk_enable(gpt_clk);
+	ret = clk_prepare_enable(gpt_clk);
 	if (ret < 0) {
-		pr_err("%s:couldn't enable gpt clock\n", __func__);
-		goto err_clk;
+		pr_err("%s:couldn't prepare-enable gpt clock\n", __func__);
+		goto err_prepare_enable_clk;
 	}
 
 	spear_clockevent_init();
@@ -230,7 +230,7 @@ void __init spear_setup_timer(void)
 
 	return;
 
-err_clk:
+err_prepare_enable_clk:
 	clk_put(gpt_clk);
 err_iomap:
 	iounmap(gpt_base);