summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/timer-prima2.c
diff options
context:
space:
mode:
authorZhiwu Song <Zhiwu.Song@csr.com>2014-07-03 20:52:51 +0800
committerDaniel Lezcano <daniel.lezcano@linaro.org>2014-07-23 12:02:34 +0200
commit38941522ecbd2198694b742343a67ea128b44913 (patch)
tree861ed0477c052cda4d04e8601f90c9667d0cf223 /drivers/clocksource/timer-prima2.c
parent40c96312dc3534d97c64d7d69acf1ea14ceff404 (diff)
downloadlinux-38941522ecbd2198694b742343a67ea128b44913.tar.gz
linux-38941522ecbd2198694b742343a67ea128b44913.tar.bz2
linux-38941522ecbd2198694b742343a67ea128b44913.zip
clocksource: sirf: Fix incorrect clock enable counter for timer
In the clocksource driver, we didn't explicitly enable the clock. it makes the clk reference counter wrong. We didn't encounter any hang issue because the tick's clock input has been open and is shared by some other hardware components, but if we don't enable those components in kernel, in the stage of disabling unused clk in kernel boot, Linux tick hangs. This patch fixes it. it does an explicit prepare and enable to the clock input, and increases the usage counter of the clk. Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource/timer-prima2.c')
-rw-r--r--drivers/clocksource/timer-prima2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c
index a722aac7ac02..ce18d570e1cd 100644
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
@@ -200,6 +200,9 @@ static void __init sirfsoc_prima2_timer_init(struct device_node *np)
clk = of_clk_get(np, 0);
BUG_ON(IS_ERR(clk));
+
+ BUG_ON(clk_prepare_enable(clk));
+
rate = clk_get_rate(clk);
BUG_ON(rate < PRIMA2_CLOCK_FREQ);