summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-11-08 11:07:59 +0100
committerDaniel Lezcano <daniel.lezcano@linaro.org>2013-11-20 21:55:22 +0100
commitbd7549308eed47b3750b3dab692034a553e75663 (patch)
treeede07ccf3add1c6f37aa49702ddabe9a97ab1342 /drivers/clocksource
parenta4a5fc3b64cd553820d97667056506636eaaba77 (diff)
downloadop-kernel-dev-bd7549308eed47b3750b3dab692034a553e75663.zip
op-kernel-dev-bd7549308eed47b3750b3dab692034a553e75663.tar.gz
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/clocksource')
-rw-r--r--drivers/clocksource/sh_mtu2.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index e6cfb32..3cf1283 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)
goto err1;
}
+ ret = clk_prepare(p->clk);
+ if (ret < 0)
+ goto err2;
+
ret = sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),
cfg->clockevent_rating);
if (ret < 0)
- goto err2;
+ goto err3;
return 0;
-
+ err3:
+ clk_unprepare(p->clk);
err2:
clk_put(p->clk);
err1:
OpenPOWER on IntegriCloud