diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-08 05:08:00 -0500 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-11-20 15:55:24 -0500 |
| commit | 1c09eb3e2d761ffd152faa6b9d06caf560e7d445 (patch) | |
| tree | 8a80e10999b1e898f1d0619c5bce09eaf9d082ca /drivers/clocksource | |
| parent | 394a4486f009a184b58fc2f2435d6f5f800870bb (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.c | 9 |
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) | |||
| 472 | ret = PTR_ERR(p->clk); | 472 | ret = PTR_ERR(p->clk); |
| 473 | goto err1; | 473 | goto err1; |
| 474 | } | 474 | } |
| 475 | |||
| 476 | ret = clk_prepare(p->clk); | ||
| 477 | if (ret < 0) | ||
| 478 | goto err2; | ||
| 479 | |||
| 475 | p->cs_enabled = false; | 480 | p->cs_enabled = false; |
| 476 | p->enable_count = 0; | 481 | p->enable_count = 0; |
| 477 | 482 | ||
| @@ -479,10 +484,12 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) | |||
| 479 | cfg->clockevent_rating, | 484 | cfg->clockevent_rating, |
| 480 | cfg->clocksource_rating); | 485 | cfg->clocksource_rating); |
| 481 | if (ret < 0) | 486 | if (ret < 0) |
| 482 | goto err2; | 487 | goto err3; |
| 483 | 488 | ||
| 484 | return 0; | 489 | return 0; |
| 485 | 490 | ||
| 491 | err3: | ||
| 492 | clk_unprepare(p->clk); | ||
| 486 | err2: | 493 | err2: |
| 487 | clk_put(p->clk); | 494 | clk_put(p->clk); |
| 488 | err1: | 495 | err1: |
