lkml.org 
[lkml]   [2014]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 20/59] watchdog: kempld-wdt: Use the correct value when configuring the prescaler with the watchdog
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: gundberg <per.gundberg@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@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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/watchdog/kempld_wdt.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/watchdog/kempld_wdt.c
    +++ b/drivers/watchdog/kempld_wdt.c
    @@ -162,7 +162,7 @@ static int kempld_wdt_set_stage_timeout(
    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);



    \
     
     \ /
      Last update: 2014-07-05 02:01    [W:2.146 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site