On Mon, Sep 19, 2011 at 03:24:00PM -0300, Fabio Estevam wrote: > Activate WDZST so that the watchdog timer does not count during low power modes. Should be a user-selectable option IMHO. Changing the default behaviour may cause regressions. > > Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> > --- > drivers/watchdog/imx2_wdt.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c > index 19df82d..e1a9abb 100644 > --- a/drivers/watchdog/imx2_wdt.c > +++ b/drivers/watchdog/imx2_wdt.c > @@ -41,6 +41,7 @@ > #define IMX2_WDT_WCR_WT (0xFF << 8) /* -> Watchdog Timeout Field */ > #define IMX2_WDT_WCR_WRE (1 << 3) /* -> WDOG Reset Enable */ > #define IMX2_WDT_WCR_WDE (1 << 2) /* -> Watchdog Enable */ > +#define IMX2_WDT_WCR_WDZST (1 << 0) /* -> Watchdog Low Power */ > > #define IMX2_WDT_WSR 0x02 /* Service Register */ > #define IMX2_WDT_SEQ1 0x5555 /* -> service sequence 1 */ > @@ -93,6 +94,9 @@ static inline void imx2_wdt_setup(void) > /* Set the watchdog's Time-Out value */ > val |= WDOG_SEC_TO_COUNT(imx2_wdt.timeout); > > + /* Disable watchdog suring low power modes */ > + val |= IMX2_WDT_WCR_WDZST; > + > /* 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 -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature