[3.11.y.z extended stable] Patch "watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From adcfcaebc0217718c2ddb6069585683549ce5a2d Mon Sep 17 00:00:00 2001
From: gundberg <per.gundberg at icomera.com>
Date: Thu, 24 Apr 2014 15:49:19 +0200
Subject: watchdog: kempld-wdt: Use the correct value when configuring the
 prescaler with the watchdog

commit a9e0436b303e94ba57d3bd4b1fcbeaa744b7ebeb upstream.

Use the prescaler index, rather than its value, to configure the watchdog.
This will prevent a mismatch with the prescaler used to calculate the cycles.

Signed-off-by: Per Gundberg <per.gundberg at icomera.com>
Reviewed-by: Guenter Roeck <linux at roeck-us.net>
Reviewed-by: Michael Brunner <michael.brunner at kontron.com>
Tested-by: Michael Brunner <michael.brunner at kontron.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/watchdog/kempld_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c
index 5c3d4df63e68..22b9a036b3e1 100644
--- a/drivers/watchdog/kempld_wdt.c
+++ b/drivers/watchdog/kempld_wdt.c
@@ -163,7 +163,7 @@ static int kempld_wdt_set_stage_timeout(struct kempld_wdt_data *wdt_data,
 	kempld_get_mutex(pld);
 	stage_cfg = kempld_read8(pld, KEMPLD_WDT_STAGE_CFG(stage->id));
 	stage_cfg &= ~STAGE_CFG_PRESCALER_MASK;
-	stage_cfg |= STAGE_CFG_SET_PRESCALER(prescaler);
+	stage_cfg |= STAGE_CFG_SET_PRESCALER(PRESCALER_21);
 	kempld_write8(pld, KEMPLD_WDT_STAGE_CFG(stage->id), stage_cfg);
 	kempld_write32(pld, KEMPLD_WDT_STAGE_TIMEOUT(stage->id),
 			stage_timeout);
--
1.9.1