diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-08 05:07:59 -0500 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-11-20 15:55:22 -0500 |
commit | bd7549308eed47b3750b3dab692034a553e75663 (patch) | |
tree | ede07ccf3add1c6f37aa49702ddabe9a97ab1342 /drivers | |
parent | a4a5fc3b64cd553820d97667056506636eaaba77 (diff) |
clocksource: sh_mtu2: 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')
-rw-r--r-- | drivers/clocksource/sh_mtu2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c index e6cfb328eb2e..3cf12834681e 100644 --- a/drivers/clocksource/sh_mtu2.c +++ b/drivers/clocksource/sh_mtu2.c | |||
@@ -313,13 +313,18 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) | |||
313 | goto err1; | 313 | goto err1; |
314 | } | 314 | } |
315 | 315 | ||
316 | ret = clk_prepare(p->clk); | ||
317 | if (ret < 0) | ||
318 | goto err2; | ||
319 | |||
316 | ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), | 320 | ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), |
317 | cfg->clockevent_rating); | 321 | cfg->clockevent_rating); |
318 | if (ret < 0) | 322 | if (ret < 0) |
319 | goto err2; | 323 | goto err3; |
320 | 324 | ||
321 | return 0; | 325 | return 0; |
322 | 326 | err3: | |
327 | clk_unprepare(p->clk); | ||
323 | err2: | 328 | err2: |
324 | clk_put(p->clk); | 329 | clk_put(p->clk); |
325 | err1: | 330 | err1: |