diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-07-29 02:39:34 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2008-08-04 21:26:06 -0400 |
| commit | 214c6a7ed13e01cab2addeef56124067e4d20147 (patch) | |
| tree | 9b2fa4dcc925bdb8503562d5f601ecf500d95380 | |
| parent | 04fef228fb00dd79475a2313f4ba73b4fbfe2faa (diff) | |
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
Signed-off-by: Eric Miao <eric.miao@marvell.com>
| -rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 5 |
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 @@ | |||
| 31 | #include <asm/arch/pxa-regs.h> | 31 | #include <asm/arch/pxa-regs.h> |
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||
| 34 | #include <asm/arch/reset.h> | ||
| 35 | |||
| 34 | #include <asm/hardware.h> | 36 | #include <asm/hardware.h> |
| 35 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
| 36 | 38 | ||
| @@ -162,7 +164,8 @@ static int __init sa1100dog_init(void) | |||
| 162 | * we suspend, RCSR will be cleared, and the watchdog | 164 | * we suspend, RCSR will be cleared, and the watchdog |
| 163 | * reset reason will be lost. | 165 | * reset reason will be lost. |
| 164 | */ | 166 | */ |
| 165 | boot_status = (RCSR & RCSR_WDR) ? WDIOF_CARDRESET : 0; | 167 | boot_status = (reset_status & RESET_STATUS_WATCHDOG) ? |
| 168 | WDIOF_CARDRESET : 0; | ||
| 166 | pre_margin = OSCR_FREQ * margin; | 169 | pre_margin = OSCR_FREQ * margin; |
| 167 | 170 | ||
| 168 | ret = misc_register(&sa1100dog_miscdev); | 171 | ret = misc_register(&sa1100dog_miscdev); |
