Commit fdfcab17 authored Oct 08, 2013 by Shinya Kuribayashi Committed by Daniel Lezcano Oct 22, 2013

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>

parent 4a7d3e8a

drivers/clocksource/em_sti.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message