diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-09-11 07:48:15 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-11 22:40:32 -0700 |
| commit | cab463a2959f4c738fcb26bb69ea7e7ae5755272 (patch) | |
| tree | f8876f62f8453836c4168048ded731b1fc294511 /drivers/watchdog | |
| parent | c7e783d6adc7798307e7063e11f4127117446d5a (diff) | |
| download | op-kernel-dev-cab463a2959f4c738fcb26bb69ea7e7ae5755272.zip op-kernel-dev-cab463a2959f4c738fcb26bb69ea7e7ae5755272.tar.gz | |
watchdog: ks8695: sink registers into driver
Commit 70adc3f32adc2fb90b0107c020678588e4cf9f51
"ARM: ks8695: merge the timer header into the timer driver"
accidentally broke the ks8695 watchdog since it was using
the timer registers in watchdog mode.
Perform the same operation here: push the registers down
into the driver, so it is self-contained, and we can keep
depopulating the <mach/*> namespace.
Reported-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/watchdog')
| -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 59e75d9..c1a4d3b 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 */ |
