diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 15:27:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 15:27:39 -0700 |
| commit | b75cdf388ecdcd5ab5e66178f19c39a4c94dea26 (patch) | |
| tree | 05d5f8dedd0fbd9b93fb10ff6ad9aa81630372f8 | |
| parent | 881787a7d379a4a4474e94fce87b511a7f641595 (diff) | |
| parent | f6af5da388a5d058cd9a5a47d030e3966b22e991 (diff) | |
| download | linux-3.10-b75cdf388ecdcd5ab5e66178f19c39a4c94dea26.tar.gz linux-3.10-b75cdf388ecdcd5ab5e66178f19c39a4c94dea26.tar.bz2 linux-3.10-b75cdf388ecdcd5ab5e66178f19c39a4c94dea26.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
| -rw-r--r-- | drivers/char/watchdog/mpcore_wdt.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/hardware/arm_twd.h | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c index c694eee1fb2..75ca84ed4ad 100644 --- a/drivers/char/watchdog/mpcore_wdt.c +++ b/drivers/char/watchdog/mpcore_wdt.c @@ -30,6 +30,8 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/device.h> + +#include <asm/hardware/arm_twd.h> #include <asm/uaccess.h> struct mpcore_wdt { diff --git a/include/asm-arm/hardware/arm_twd.h b/include/asm-arm/hardware/arm_twd.h new file mode 100644 index 00000000000..131d5b40e07 --- /dev/null +++ b/include/asm-arm/hardware/arm_twd.h @@ -0,0 +1,16 @@ +#ifndef __ASM_HARDWARE_TWD_H +#define __ASM_HARDWARE_TWD_H + +#define TWD_TIMER_LOAD 0x00 +#define TWD_TIMER_COUNTER 0x04 +#define TWD_TIMER_CONTROL 0x08 +#define TWD_TIMER_INTSTAT 0x0C + +#define TWD_WDOG_LOAD 0x20 +#define TWD_WDOG_COUNTER 0x24 +#define TWD_WDOG_CONTROL 0x28 +#define TWD_WDOG_INTSTAT 0x2C +#define TWD_WDOG_RESETSTAT 0x30 +#define TWD_WDOG_DISABLE 0x34 + +#endif |