aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/sa1100_wdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog/sa1100_wdt.c')
-rw-r--r--drivers/watchdog/sa1100_wdt.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 27d6898a7c98..31a48437dc3d 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -29,10 +29,11 @@
29#include <linux/uaccess.h> 29#include <linux/uaccess.h>
30 30
31#ifdef CONFIG_ARCH_PXA 31#ifdef CONFIG_ARCH_PXA
32#include <asm/arch/pxa-regs.h> 32#include <mach/pxa-regs.h>
33#endif 33#endif
34 34
35#include <asm/hardware.h> 35#include <mach/reset.h>
36#include <mach/hardware.h>
36 37
37#define OSCR_FREQ CLOCK_TICK_RATE 38#define OSCR_FREQ CLOCK_TICK_RATE
38 39
@@ -159,7 +160,8 @@ static int __init sa1100dog_init(void)
159 * we suspend, RCSR will be cleared, and the watchdog 160 * we suspend, RCSR will be cleared, and the watchdog
160 * reset reason will be lost. 161 * reset reason will be lost.
161 */ 162 */
162 boot_status = (RCSR & RCSR_WDR) ? WDIOF_CARDRESET : 0; 163 boot_status = (reset_status & RESET_STATUS_WATCHDOG) ?
164 WDIOF_CARDRESET : 0;
163 pre_margin = OSCR_FREQ * margin; 165 pre_margin = OSCR_FREQ * margin;
164 166
165 ret = misc_register(&sa1100dog_miscdev); 167 ret = misc_register(&sa1100dog_miscdev);