[PATCH 3.13 120/198] watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog
Kamal Mostafa
kamal at canonical.com
Tue Jul 15 21:29:50 UTC 2014
3.13.11.5 -stable review patch. If anyone has any objections, please let me know.
------------------
From: gundberg <per.gundberg at icomera.com>
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: Kamal Mostafa <kamal 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 20dc738..d9c1a16 100644
--- a/drivers/watchdog/kempld_wdt.c
+++ b/drivers/watchdog/kempld_wdt.c
@@ -162,7 +162,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
More information about the kernel-team
mailing list