diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-12 07:40:57 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 07:40:57 +0200 |
| commit | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (patch) | |
| tree | 5075be2aea3514a9270c0ec48fbc728d8f91f257 | |
| parent | Merge branch 'pnx4008-removal' of git://git.antcom.de/linux-2.6 into next/cle... (diff) | |
| parent | watchdog: ks8695: sink registers into driver (diff) | |
| download | linux-0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4.tar.xz linux-0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4.zip | |
Merge branch 'ks8695/timer' into next/cleanup
* ks8695/timer:
watchdog: ks8695: sink registers into driver
| -rw-r--r-- | drivers/watchdog/ks8695_wdt.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index 59e75d9a6b7f..c1a4d3bf581d 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c @@ -24,7 +24,19 @@ #include <linux/io.h> #include <linux/uaccess.h> #include <mach/hardware.h> -#include <mach/regs-timer.h> + +#define KS8695_TMR_OFFSET (0xF0000 + 0xE400) +#define KS8695_TMR_VA (KS8695_IO_VA + KS8695_TMR_OFFSET) + +/* + * Timer registers + */ +#define KS8695_TMCON (0x00) /* Timer Control Register */ +#define KS8695_T0TC (0x08) /* Timer 0 Timeout Count Register */ +#define TMCON_T0EN (1 << 0) /* Timer 0 Enable */ + +/* Timer0 Timeout Counter Register */ +#define T0TC_WATCHDOG (0xff) /* Enable watchdog mode */ #define WDT_DEFAULT_TIME 5 /* seconds */ #define WDT_MAX_TIME 171 /* seconds */ |