| From 1f363ca74418dcabd44f58e503fa9b6935c40b3b Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 8 Nov 2013 11:08:00 +0100 |
| Subject: 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> |
| (cherry picked from commit 1c09eb3e2d761ffd152faa6b9d06caf560e7d445) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_tmu.c | 9 ++++++++- |
| 1 file changed, 8 insertions(+), 1 deletion(-) |
| |
| 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: |
| -- |
| 1.8.5.rc3 |
| |