summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/ks8695_wdt.c
diff options
context:
space:
mode:
authorAndrew Victor2009-08-04 20:55:56 +0200
committerRussell King2009-08-05 23:06:56 +0200
commit0a51810aa058a0a4ac76dd6f87f4d10bee774e2e (patch)
tree4d676cbdcb48062850f3b7575a8129d90c8e02a9 /drivers/watchdog/ks8695_wdt.c
parentMerge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux (diff)
downloadkernel-qcow2-linux-0a51810aa058a0a4ac76dd6f87f4d10bee774e2e.tar.gz
kernel-qcow2-linux-0a51810aa058a0a4ac76dd6f87f4d10bee774e2e.tar.xz
kernel-qcow2-linux-0a51810aa058a0a4ac76dd6f87f4d10bee774e2e.zip
ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers
Stop referencing CLOCK_TICK_RATE in the KS8695 drivers, rather refer to a KS8695_CLOCK_RATE. Issue pointed out by Russell King on arm-linux-kernel mailing list. Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/watchdog/ks8695_wdt.c')
-rw-r--r--drivers/watchdog/ks8695_wdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 00b03eb43bf0..e1c82769b08e 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -66,7 +66,7 @@ static inline void ks8695_wdt_stop(void)
static inline void ks8695_wdt_start(void)
{
unsigned long tmcon;
- unsigned long tval = wdt_time * CLOCK_TICK_RATE;
+ unsigned long tval = wdt_time * KS8695_CLOCK_RATE;
spin_lock(&ks8695_lock);
/* disable timer0 */
@@ -103,7 +103,7 @@ static inline void ks8695_wdt_reload(void)
static int ks8695_wdt_settimeout(int new_time)
{
/*
- * All counting occurs at SLOW_CLOCK / 128 = 0.256 Hz
+ * All counting occurs at KS8695_CLOCK_RATE / 128 = 0.256 Hz
*
* Since WDV is a 16-bit counter, the maximum period is
* 65536 / 0.256 = 256 seconds.