diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 11:07:40 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2010-05-25 05:03:07 -0400 |
commit | 42bd5d499455fe4235bb82cffe937a4089a8bba9 (patch) | |
tree | a733178ddafa8fd8fcfd5622ac73031034d0b0da /drivers/watchdog/bfin_wdt.c | |
parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) |
watchdog: bfin: use new common Blackfin watchdog header
use new common Blackfin watchdog header
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/bfin_wdt.c')
-rw-r--r-- | drivers/watchdog/bfin_wdt.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index 9c7ccd1e9088..9042a95fc98c 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |
25 | #include <asm/blackfin.h> | 25 | #include <asm/blackfin.h> |
26 | #include <asm/bfin_watchdog.h> | ||
26 | 27 | ||
27 | #define stamp(fmt, args...) \ | 28 | #define stamp(fmt, args...) \ |
28 | pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args) | 29 | pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args) |
@@ -49,24 +50,6 @@ | |||
49 | # define bfin_write_WDOG_STAT(x) bfin_write_WDOGA_STAT(x) | 50 | # define bfin_write_WDOG_STAT(x) bfin_write_WDOGA_STAT(x) |
50 | #endif | 51 | #endif |
51 | 52 | ||
52 | /* Bit in SWRST that indicates boot caused by watchdog */ | ||
53 | #define SWRST_RESET_WDOG 0x4000 | ||
54 | |||
55 | /* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */ | ||
56 | #define WDOG_EXPIRED 0x8000 | ||
57 | |||
58 | /* Masks for WDEV field in WDOG_CTL register */ | ||
59 | #define ICTL_RESET 0x0 | ||
60 | #define ICTL_NMI 0x2 | ||
61 | #define ICTL_GPI 0x4 | ||
62 | #define ICTL_NONE 0x6 | ||
63 | #define ICTL_MASK 0x6 | ||
64 | |||
65 | /* Masks for WDEN field in WDOG_CTL register */ | ||
66 | #define WDEN_MASK 0x0FF0 | ||
67 | #define WDEN_ENABLE 0x0000 | ||
68 | #define WDEN_DISABLE 0x0AD0 | ||
69 | |||
70 | /* some defaults */ | 53 | /* some defaults */ |
71 | #define WATCHDOG_TIMEOUT 20 | 54 | #define WATCHDOG_TIMEOUT 20 |
72 | 55 | ||