From: Eric Miao <eric.miao@marvell.com>
Date: Tue, 29 Jul 2008 06:39:34 +0000 (+0800)
Subject: [ARM] sa1100_wdt: use reset_status to remember watchdog reset status
X-Git-Tag: v2.6.27-rc3~67^2~5^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=214c6a7ed13e01cab2addeef56124067e4d20147;p=linux-2.6

[ARM] sa1100_wdt: use reset_status to remember watchdog reset status

Signed-off-by: Eric Miao <eric.miao@marvell.com>
---

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 34a2b3b818..e42002d2f8 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);