Skip to content

Commit

Permalink
clocksource: em_sti: convert to clk_prepare/unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shinya Kuribayashi authored and Daniel Lezcano committed Oct 22, 2013
1 parent 4a7d3e8 commit fdfcab1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/clocksource/em_sti.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit fdfcab1

Please sign in to comment.