diff options
| author | Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> | 2013-10-08 18:01:28 +0900 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-10-22 22:36:24 +0200 |
| commit | fdfcab17a26ab2179c9d233f8a1b63e93cff9a4a (patch) | |
| tree | 28ffbb3cb78186d3919f21d798698a9b494a9148 /drivers/clocksource/em_sti.c | |
| parent | 4a7d3e8a9939cf8073c247286d81cbe0ae48eba2 (diff) | |
| download | linux-stable-fdfcab17a26ab2179c9d233f8a1b63e93cff9a4a.tar.gz linux-stable-fdfcab17a26ab2179c9d233f8a1b63e93cff9a4a.tar.bz2 linux-stable-fdfcab17a26ab2179c9d233f8a1b63e93cff9a4a.zip | |
clocksource: em_sti: convert to clk_prepare/unprepare
Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can
migrate to the common clock framework.
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource/em_sti.c')
| -rw-r--r-- | drivers/clocksource/em_sti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c index 3a5909c12d42..9d170834fcf3 100644 --- a/drivers/clocksource/em_sti.c +++ b/drivers/clocksource/em_sti.c @@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p) int ret; /* enable clock */ - ret = clk_enable(p->clk); + ret = clk_prepare_enable(p->clk); if (ret) { dev_err(&p->pdev->dev, "cannot enable clock\n"); return ret; @@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p) em_sti_write(p, STI_INTENCLR, 3); /* stop clock */ - clk_disable(p->clk); + clk_disable_unprepare(p->clk); } static cycle_t em_sti_count(struct em_sti_priv *p) |