diff options
| author | Graf Yang <graf.yang@analog.com> | 2010-01-25 04:47:43 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 06:30:50 +0100 |
| commit | 64b33a00dc39dceac04dbd7622ab14017e074712 (patch) | |
| tree | d0869e92de21dad8b36ac8d13fa935699fcfb9a1 /arch | |
| parent | Blackfin: add dma_disable_irq_nosync() API for irq handlers (diff) | |
| download | linux-64b33a00dc39dceac04dbd7622ab14017e074712.tar.xz linux-64b33a00dc39dceac04dbd7622ab14017e074712.zip | |
Blackfin: split watchdog definitions into a dedicated header file
This allows things to be shared between the different watchdog sources.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/include/asm/bfin_watchdog.h | 30 | ||||
| -rw-r--r-- | arch/blackfin/kernel/nmi.c | 16 |
2 files changed, 31 insertions, 15 deletions
diff --git a/arch/blackfin/include/asm/bfin_watchdog.h b/arch/blackfin/include/asm/bfin_watchdog.h new file mode 100644 index 000000000000..dce09829a095 --- /dev/null +++ b/arch/blackfin/include/asm/bfin_watchdog.h @@ -0,0 +1,30 @@ +/* + * bfin_watchdog.h - Blackfin watchdog definitions + * + * Copyright 2006-2010 Analog Devices Inc. + * + * Licensed under the GPL-2 or later. + */ + +#ifndef _BFIN_WATCHDOG_H +#define _BFIN_WATCHDOG_H + +/* Bit in SWRST that indicates boot caused by watchdog */ +#define SWRST_RESET_WDOG 0x4000 + +/* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */ +#define WDOG_EXPIRED 0x8000 + +/* Masks for WDEV field in WDOG_CTL register */ +#define ICTL_RESET 0x0 +#define ICTL_NMI 0x2 +#define ICTL_GPI 0x4 +#define ICTL_NONE 0x6 +#define ICTL_MASK 0x6 + +/* Masks for WDEN field in WDOG_CTL register */ +#define WDEN_MASK 0x0FF0 +#define WDEN_ENABLE 0x0000 +#define WDEN_DISABLE 0x0AD0 + +#endif diff --git a/arch/blackfin/kernel/nmi.c b/arch/blackfin/kernel/nmi.c index 19093c17632b..0b5f72f17fd0 100644 --- a/arch/blackfin/kernel/nmi.c +++ b/arch/blackfin/kernel/nmi.c @@ -20,21 +20,7 @@ #include <asm/blackfin.h> #include <asm/atomic.h> #include <asm/cacheflush.h> - -/* Bit in WDOG_CTL that indicates watchdog has expired (WDR0) */ -#define WDOG_EXPIRED 0x8000 - -/* Masks for WDEV field in WDOG_CTL register */ -#define ICTL_RESET 0x0 -#define ICTL_NMI 0x2 -#define ICTL_GPI 0x4 -#define ICTL_NONE 0x6 -#define ICTL_MASK 0x6 - -/* Masks for WDEN field in WDOG_CTL register */ -#define WDEN_MASK 0x0FF0 -#define WDEN_ENABLE 0x0000 -#define WDEN_DISABLE 0x0AD0 +#include <asm/bfin_watchdog.h> #define DRV_NAME "nmi-wdt" |