summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-11 22:40:57 -0700
committerOlof Johansson <olof@lixom.net>2012-09-11 22:40:57 -0700
commit0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (patch)
tree5075be2aea3514a9270c0ec48fbc728d8f91f257 /drivers/watchdog
parent7ad8f8f1c5a3a92a303fcf90cb2b15205c0a7635 (diff)
parentcab463a2959f4c738fcb26bb69ea7e7ae5755272 (diff)
downloadblackbird-op-linux-0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4.tar.gz
blackbird-op-linux-0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4.zip
Merge branch 'ks8695/timer' into next/cleanup
* ks8695/timer: watchdog: ks8695: sink registers into driver
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/ks8695_wdt.c14
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 */
OpenPOWER on IntegriCloud