diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:28:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:28:47 -0400 |
| commit | 2313bcdcc9ff1e42f51b200dc65ddaae14c347f4 (patch) | |
| tree | fdb0e3f953841cdd661e36c40a965c9e044d82f5 /arch/arm | |
| parent | 59ed2bb27492f74ab898ee1e26c69dfd78444640 (diff) | |
| parent | 3f43f68e29f1dcb853d70280c7412fc0ef9a0da6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog: (25 commits)
watchdog: WatchDog Timer Driver Core - Add minimum and max timeout
watchdog: WatchDog Timer Driver Core - Add ioctl call
watchdog: WatchDog Timer Driver Core - Add nowayout feature
watchdog: WatchDog Timer Driver Core - Add Magic Close feature
watchdog: WatchDog Timer Driver Core - Add WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT ioctl
watchdog: WatchDog Timer Driver Core - Add WDIOC_SETOPTIONS ioctl
watchdog: WatchDog Timer Driver Core - Add WDIOC_KEEPALIVE ioctl
watchdog: WatchDog Timer Driver Core - Add basic ioctl functionality
watchdog: WatchDog Timer Driver Core - Add basic framework
watchdog: hpwdt: add next gen HP servers
watchdog: it8712f_wdt.c: improve includes
watchdog: at91sam9/wdt: move register header to drivers
watchdog: Add Xilinx watchdog timer driver
watchdog: remove empty pm-functions
watchdog: sp805: Flush posted writes in enable/disable.
watchdog: sp805: Don't write 0 to the load value register.
watchdog: imx2_wdt: add device tree probe support
watchdog: s3c2410: Add support for device tree based probe
watchdog: mpcore_wdt: Add suspend/resume support.
watchdog: mtx1-wdt: use dev_{err,info} instead of printk()
...
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_wdt.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h deleted file mode 100644 index fecc2e9f0ca8..000000000000 --- a/arch/arm/mach-at91/include/mach/at91_wdt.h +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-at91/include/mach/at91_wdt.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2007 Andrew Victor | ||
| 5 | * Copyright (C) 2007 Atmel Corporation. | ||
| 6 | * | ||
| 7 | * Watchdog Timer (WDT) - System peripherals regsters. | ||
| 8 | * Based on AT91SAM9261 datasheet revision D. | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License as published by | ||
| 12 | * the Free Software Foundation; either version 2 of the License, or | ||
| 13 | * (at your option) any later version. | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifndef AT91_WDT_H | ||
| 17 | #define AT91_WDT_H | ||
| 18 | |||
| 19 | #define AT91_WDT_CR (AT91_WDT + 0x00) /* Watchdog Control Register */ | ||
| 20 | #define AT91_WDT_WDRSTT (1 << 0) /* Restart */ | ||
| 21 | #define AT91_WDT_KEY (0xa5 << 24) /* KEY Password */ | ||
| 22 | |||
| 23 | #define AT91_WDT_MR (AT91_WDT + 0x04) /* Watchdog Mode Register */ | ||
| 24 | #define AT91_WDT_WDV (0xfff << 0) /* Counter Value */ | ||
| 25 | #define AT91_WDT_WDFIEN (1 << 12) /* Fault Interrupt Enable */ | ||
| 26 | #define AT91_WDT_WDRSTEN (1 << 13) /* Reset Processor */ | ||
| 27 | #define AT91_WDT_WDRPROC (1 << 14) /* Timer Restart */ | ||
| 28 | #define AT91_WDT_WDDIS (1 << 15) /* Watchdog Disable */ | ||
| 29 | #define AT91_WDT_WDD (0xfff << 16) /* Delta Value */ | ||
| 30 | #define AT91_WDT_WDDBGHLT (1 << 28) /* Debug Halt */ | ||
| 31 | #define AT91_WDT_WDIDLEHLT (1 << 29) /* Idle Halt */ | ||
| 32 | |||
| 33 | #define AT91_WDT_SR (AT91_WDT + 0x08) /* Watchdog Status Register */ | ||
| 34 | #define AT91_WDT_WDUNF (1 << 0) /* Watchdog Underflow */ | ||
| 35 | #define AT91_WDT_WDERR (1 << 1) /* Watchdog Error */ | ||
| 36 | |||
| 37 | #endif | ||