i.MX reference manual states that software can only write "1" into the WDE bit. Remove the line that sets 0 to this bit and while at it remove an unneeded extra write to register WCR. Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> --- drivers/watchdog/imx2_wdt.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index b8ef2c6..19df82d 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -89,13 +89,10 @@ static inline void imx2_wdt_setup(void) val &= ~IMX2_WDT_WCR_WT; /* Generate reset if WDOG times out */ val &= ~IMX2_WDT_WCR_WRE; - /* Keep Watchdog Disabled */ - val &= ~IMX2_WDT_WCR_WDE; + /* Set the watchdog's Time-Out value */ val |= WDOG_SEC_TO_COUNT(imx2_wdt.timeout); - __raw_writew(val, imx2_wdt.base + IMX2_WDT_WCR); - /* enable the watchdog */ val |= IMX2_WDT_WCR_WDE; __raw_writew(val, imx2_wdt.base + IMX2_WDT_WCR); -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
