watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the...
authorgundberg <per.gundberg@icomera.com>
Thu, 24 Apr 2014 13:49:19 +0000 (15:49 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Tue, 10 Jun 2014 19:39:48 +0000 (21:39 +0200)
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@icomera.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Michael Brunner <michael.brunner@kontron.com>
Tested-by: Michael Brunner <michael.brunner@kontron.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable <stable@vger.kernel.org>
drivers/watchdog/kempld_wdt.c

index 20dc73844737a99cf30aa6852f6bfceb06d04984..d9c1a1601926e277c628905a2d54b582ec128eab 100644 (file)
@@ -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);