Skip to content

Commit

Permalink
clocksource: sh_tmu: Add clk_prepare/unprepare support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Daniel Lezcano committed Nov 20, 2013
1 parent 394a448 commit 1c09eb3
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/clocksource/sh_tmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,17 +472,24 @@ 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;

ret = sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
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:
Expand Down

0 comments on commit 1c09eb3

Please sign in to comment.