diff options
author | gundberg <per.gundberg@icomera.com> | 2014-04-24 15:49:19 +0200 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-17 13:43:16 +0200 |
commit | ec03435f8102baf52e783b72d11359f8d31f3629 (patch) | |
tree | 279f3fc8cb763cee45d1b1fa91f12c4059a74d2a /drivers/watchdog | |
parent | 17178d1a8770860f2ea6aa48413b77102e45edf9 (diff) | |
download | lwn-ec03435f8102baf52e783b72d11359f8d31f3629.tar.gz lwn-ec03435f8102baf52e783b72d11359f8d31f3629.zip |
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@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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/kempld_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |