diff options
| author | Viresh Kumar <viresh.kumar@st.com> | 2012-04-16 13:56:18 +0530 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-12 21:19:28 +0200 |
| commit | f8abc080d33e69dfa2c3dd0f84c31832e2679091 (patch) | |
| tree | dc01d0a82f07f3e906ad1e0ee646941de5d59483 /arch/arm/plat-spear | |
| parent | a45896bd3a4b7beb571fa704efa7c2782b791093 (diff) | |
| download | blackbird-op-linux-f8abc080d33e69dfa2c3dd0f84c31832e2679091.tar.gz blackbird-op-linux-f8abc080d33e69dfa2c3dd0f84c31832e2679091.zip | |
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.c | 8 |
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) 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); |
