]> err.no Git - linux-2.6/commitdiff
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
authorEric Miao <eric.miao@marvell.com>
Tue, 29 Jul 2008 06:39:34 +0000 (14:39 +0800)
committerEric Miao <eric.miao@marvell.com>
Tue, 5 Aug 2008 01:26:06 +0000 (09:26 +0800)
Signed-off-by: Eric Miao <eric.miao@marvell.com>
drivers/watchdog/sa1100_wdt.c

index 34a2b3b81800785d8e2967ddd388cfa01905658a..e42002d2f815898069dd13ff365b96f616554d3f 100644 (file)
@@ -31,6 +31,8 @@
 #include <asm/arch/pxa-regs.h>
 #endif
 
+#include <asm/arch/reset.h>
+
 #include <asm/hardware.h>
 #include <asm/uaccess.h>
 
@@ -162,7 +164,8 @@ static int __init sa1100dog_init(void)
         * we suspend, RCSR will be cleared, and the watchdog
         * reset reason will be lost.
         */
-       boot_status = (RCSR & RCSR_WDR) ? WDIOF_CARDRESET : 0;
+       boot_status = (reset_status & RESET_STATUS_WATCHDOG) ?
+                               WDIOF_CARDRESET : 0;
        pre_margin = OSCR_FREQ * margin;
 
        ret = misc_register(&sa1100dog_miscdev);