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

Commit 03399c1c authored by Russell King's avatar Russell King
Browse files

ARM: twd: ensure timer reload is reprogrammed on entry to periodic mode 



Ensure that the twd timer reload value is reprogrammed each time we
enter periodic mode.  This ensures that the reload value is always
reset correctly.

Tested-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent baaece22

arch/arm/kernel/smp_twd.c

+2 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ static void twd_set_mode(enum clock_event_mode mode, 
		/* timer load already set up */

		ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE

			| TWD_TIMER_CONTROL_PERIODIC;

		__raw_writel(twd_timer_rate / HZ, twd_base + TWD_TIMER_LOAD);

		break;

	case CLOCK_EVT_MODE_ONESHOT:

		/* period set, and timer enabled in 'next_event' hook */
@@ -81,7 +82,7 @@ int twd_timer_ack(void) 


static void __cpuinit twd_calibrate_rate(void)

{

	unsigned long load, count;

	unsigned long count;

	u64 waitjiffies;



	/*
@@ -116,10 +117,6 @@ static void __cpuinit twd_calibrate_rate(void) 
		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,

			(twd_timer_rate / 1000000) % 100);

	}



	load = twd_timer_rate / HZ;



	__raw_writel(load, twd_base + TWD_TIMER_LOAD);

}



/*