diff options
| author | Felipe Balbi <felipe.balbi@nokia.com> | 2008-09-19 21:14:01 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-10-10 09:11:10 -0400 |
| commit | 2817142f31bfbf26c216bf4f9192540c81b2d071 (patch) | |
| tree | 4cc6e07cadde49821499800f91310e12e49d0ce9 /drivers/watchdog/omap_wdt.h | |
| parent | e6bb42e3d669afbeb4c971994614bcf241687666 (diff) | |
[WATCHDOG] omap_wdt.c: sync linux-omap changes
These are changes that have been sitting in linux-omap
and were never sent upstream.
Hopefully, it'll never happen again at least for this
driver.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/omap_wdt.h')
| -rw-r--r-- | drivers/watchdog/omap_wdt.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/drivers/watchdog/omap_wdt.h b/drivers/watchdog/omap_wdt.h index 52a532a5114..fc02ec6a038 100644 --- a/drivers/watchdog/omap_wdt.h +++ b/drivers/watchdog/omap_wdt.h | |||
| @@ -30,25 +30,15 @@ | |||
| 30 | #ifndef _OMAP_WATCHDOG_H | 30 | #ifndef _OMAP_WATCHDOG_H |
| 31 | #define _OMAP_WATCHDOG_H | 31 | #define _OMAP_WATCHDOG_H |
| 32 | 32 | ||
| 33 | #define OMAP1610_WATCHDOG_BASE 0xfffeb000 | 33 | #define OMAP_WATCHDOG_REV (0x00) |
| 34 | #define OMAP2420_WATCHDOG_BASE 0x48022000 /*WDT Timer 2 */ | 34 | #define OMAP_WATCHDOG_SYS_CONFIG (0x10) |
| 35 | 35 | #define OMAP_WATCHDOG_STATUS (0x14) | |
| 36 | #ifdef CONFIG_ARCH_OMAP24XX | 36 | #define OMAP_WATCHDOG_CNTRL (0x24) |
| 37 | #define OMAP_WATCHDOG_BASE OMAP2420_WATCHDOG_BASE | 37 | #define OMAP_WATCHDOG_CRR (0x28) |
| 38 | #else | 38 | #define OMAP_WATCHDOG_LDR (0x2c) |
| 39 | #define OMAP_WATCHDOG_BASE OMAP1610_WATCHDOG_BASE | 39 | #define OMAP_WATCHDOG_TGR (0x30) |
| 40 | #define RM_RSTST_WKUP 0 | 40 | #define OMAP_WATCHDOG_WPS (0x34) |
| 41 | #endif | 41 | #define OMAP_WATCHDOG_SPR (0x48) |
| 42 | |||
| 43 | #define OMAP_WATCHDOG_REV (OMAP_WATCHDOG_BASE + 0x00) | ||
| 44 | #define OMAP_WATCHDOG_SYS_CONFIG (OMAP_WATCHDOG_BASE + 0x10) | ||
| 45 | #define OMAP_WATCHDOG_STATUS (OMAP_WATCHDOG_BASE + 0x14) | ||
| 46 | #define OMAP_WATCHDOG_CNTRL (OMAP_WATCHDOG_BASE + 0x24) | ||
| 47 | #define OMAP_WATCHDOG_CRR (OMAP_WATCHDOG_BASE + 0x28) | ||
| 48 | #define OMAP_WATCHDOG_LDR (OMAP_WATCHDOG_BASE + 0x2c) | ||
| 49 | #define OMAP_WATCHDOG_TGR (OMAP_WATCHDOG_BASE + 0x30) | ||
| 50 | #define OMAP_WATCHDOG_WPS (OMAP_WATCHDOG_BASE + 0x34) | ||
| 51 | #define OMAP_WATCHDOG_SPR (OMAP_WATCHDOG_BASE + 0x48) | ||
| 52 | 42 | ||
| 53 | /* Using the prescaler, the OMAP watchdog could go for many | 43 | /* Using the prescaler, the OMAP watchdog could go for many |
| 54 | * months before firing. These limits work without scaling, | 44 | * months before firing. These limits work without scaling, |