Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8abc080 authored by Viresh Kumar's avatar Viresh Kumar Committed by Arnd Bergmann
Browse files

SPEAr: Call clk_prepare() before calling clk_enable 



With common clock framework, it is must to call clk_{un}prepare() before/after
clk_{dis}enable. This patch fixes this for SPEAr timer.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Reviewed-by: default avatarMike Turquette <mturquette@linaro.org>
parent a45896bd

arch/arm/plat-spear/time.c

+4 −4
Original line number Diff line number Diff line
@@ -219,10 +219,10 @@ void __init spear_setup_timer(void) 
		goto err_iomap;

	}



	ret = clk_enable(gpt_clk);

	ret = clk_prepare_enable(gpt_clk);

	if (ret < 0) {

		pr_err("%s:couldn't enable gpt clock\n", __func__);

		goto err_clk;

		pr_err("%s:couldn't prepare-enable gpt clock\n", __func__);

		goto err_prepare_enable_clk;

	}



	spear_clockevent_init();
@@ -230,7 +230,7 @@ void __init spear_setup_timer(void) 


	return;



err_clk:

err_prepare_enable_clk:

	clk_put(gpt_clk);

err_iomap:

	iounmap(gpt_base);