Skip to content

Commit

Permalink
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Miao <eric.miao@marvell.com>
  • Loading branch information
Eric Miao committed Aug 5, 2008
1 parent 04fef22 commit 214c6a7
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/watchdog/sa1100_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
#include <asm/arch/pxa-regs.h>
#endif

#include <asm/arch/reset.h>

#include <asm/hardware.h>
#include <asm/uaccess.h>

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 214c6a7

Please sign in to comment.