From: Colin Cross <ccross@android.com>
Date: Sat, 18 Sep 2010 04:30:05 +0000 (-0700)
Subject: [ARM] twd: Fix updating control register in set_mode
X-Git-Tag: firefly_0821_release~9833^2~209
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ac814f31296cf8059f09f9381623ef44fc56f9c;p=firefly-linux-kernel-4.4.55.git

[ARM] twd: Fix updating control register in set_mode

Change-Id: I5096cc3fedf51024c332adbb846689e01e1f7ce0
Signed-off-by: Colin Cross <ccross@android.com>
---

diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index a0db5474bdbe..c05e88a75354 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -32,7 +32,7 @@ static void twd_set_mode(enum clock_event_mode mode,
 			struct clock_event_device *clk)
 {
 	unsigned long ctrl = __raw_readl(twd_base + TWD_TIMER_CONTROL);
-	ctrl |= TWD_TIMER_CONTROL_PRESCALE_MASK;
+	ctrl &= TWD_TIMER_CONTROL_PRESCALE_MASK;
 
 	switch (mode) {
 	case CLOCK_EVT_MODE_PERIODIC: