summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-11-08 11:08:00 +0100
committerDaniel Lezcano <daniel.lezcano@linaro.org>2013-11-20 21:55:24 +0100
commit1c09eb3e2d761ffd152faa6b9d06caf560e7d445 (patch)
tree8a80e10999b1e898f1d0619c5bce09eaf9d082ca /drivers/clocksource
parent394a4486f009a184b58fc2f2435d6f5f800870bb (diff)
clocksource: sh_tmu: Add clk_prepare/unprepare support
Prepare the clock at probe time, as there is no other appropriate place in the driver where we're allowed to sleep. Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/sh_tmu.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 15978372c937..63557cda0a7d 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -472,6 +472,11 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
ret = PTR_ERR(p->clk);
goto err1;
}
+
+ ret = clk_prepare(p->clk);
+ if (ret < 0)
+ goto err2;
+
p->cs_enabled = false;
p->enable_count = 0;
@@ -479,10 +484,12 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
cfg->clockevent_rating,
cfg->clocksource_rating);
if (ret < 0)
- goto err2;
+ goto err3;
return 0;
+ err3:
+ clk_unprepare(p->clk);
err2:
clk_put(p->clk);
err1: