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

Commit 12021372 authored by Gilles Chanteperdrix's avatar Gilles Chanteperdrix Committed by Russell King
Browse files

ARM: 7348/1: arm/spear600: fix one-shot timer 



Currently, the "clockevent_next_event" function only works correctly
if the timer is not running when this function is called, which is
not always the case when running with CONFIG_HIGH_RES_TIMERS.

Fix this by stopping the timer at the beginning of this function.

Signed-off-by: default avatarGilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@st.com>
Acked-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7e55d052

arch/arm/plat-spear/time.c

+4 −2
Original line number Diff line number Diff line
@@ -145,11 +145,13 @@ static void clockevent_set_mode(enum clock_event_mode mode, 
static int clockevent_next_event(unsigned long cycles,

				 struct clock_event_device *clk_event_dev)

{

	u16 val;

	u16 val = readw(gpt_base + CR(CLKEVT));



	if (val & CTRL_ENABLE)

		writew(val & ~CTRL_ENABLE, gpt_base + CR(CLKEVT));



	writew(cycles, gpt_base + LOAD(CLKEVT));



	val = readw(gpt_base + CR(CLKEVT));

	val |= CTRL_ENABLE | CTRL_INT_ENABLE;

	writew(val, gpt_base + CR(CLKEVT));