summaryrefslogtreecommitdiff
path: root/drivers/watchdog/sa1100_wdt.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-07-29 10:39:34 +0400
committerEric Miao <eric.miao@marvell.com>2008-08-05 05:26:06 +0400
commit214c6a7ed13e01cab2addeef56124067e4d20147 (patch)
tree9b2fa4dcc925bdb8503562d5f601ecf500d95380 /drivers/watchdog/sa1100_wdt.c
parent04fef228fb00dd79475a2313f4ba73b4fbfe2faa (diff)
downloadlinux-214c6a7ed13e01cab2addeef56124067e4d20147.tar.xz
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'drivers/watchdog/sa1100_wdt.c')
-rw-r--r--drivers/watchdog/sa1100_wdt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 34a2b3b81800..e42002d2f815 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -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);