From d780be2e25df66dc2a73d07ed17c8d961119fd79 Mon Sep 17 00:00:00 2001
From: Andrew Victor <linux@maxim.org.za>
Date: Tue, 4 Aug 2009 19:55:56 +0100
Subject: [PATCH] --- yaml --- r: 156500 b: refs/heads/master c:
 0a51810aa058a0a4ac76dd6f87f4d10bee774e2e h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-ks8695/include/mach/hardware.h | 5 +++++
 trunk/arch/arm/mach-ks8695/include/mach/timex.h    | 5 +++--
 trunk/drivers/serial/serial_ks8695.c               | 2 +-
 trunk/drivers/watchdog/ks8695_wdt.c                | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 81cc15cc548d..e2a814a28966 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38a6fe8c013e72c402b37a7ea400387120f460d8
+refs/heads/master: 0a51810aa058a0a4ac76dd6f87f4d10bee774e2e
diff --git a/trunk/arch/arm/mach-ks8695/include/mach/hardware.h b/trunk/arch/arm/mach-ks8695/include/mach/hardware.h
index 1d640d075b7e..e0f911d9e021 100644
--- a/trunk/arch/arm/mach-ks8695/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-ks8695/include/mach/hardware.h
@@ -16,6 +16,11 @@
 
 #include <asm/sizes.h>
 
+/*
+ * Clocks are derived from MCLK, which is 25Mhz
+ */
+#define KS8695_CLOCK_RATE	25000000
+
 /*
  * Physical RAM address.
  */
diff --git a/trunk/arch/arm/mach-ks8695/include/mach/timex.h b/trunk/arch/arm/mach-ks8695/include/mach/timex.h
index 4682e350369b..10f716371bd3 100644
--- a/trunk/arch/arm/mach-ks8695/include/mach/timex.h
+++ b/trunk/arch/arm/mach-ks8695/include/mach/timex.h
@@ -14,7 +14,8 @@
 #ifndef __ASM_ARCH_TIMEX_H
 #define __ASM_ARCH_TIMEX_H
 
-/* timers are derived from MCLK, which is 25MHz */
-#define CLOCK_TICK_RATE 25000000
+#include <mach/hardware.h>
+
+#define CLOCK_TICK_RATE 	KS8695_CLOCK_RATE
 
 #endif
diff --git a/trunk/drivers/serial/serial_ks8695.c b/trunk/drivers/serial/serial_ks8695.c
index 998e89dc5aaf..e0665630e4da 100644
--- a/trunk/drivers/serial/serial_ks8695.c
+++ b/trunk/drivers/serial/serial_ks8695.c
@@ -549,7 +549,7 @@ static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = {
 		.mapbase	= KS8695_UART_VA,
 		.iotype		= SERIAL_IO_MEM,
 		.irq		= KS8695_IRQ_UART_TX,
-		.uartclk	= CLOCK_TICK_RATE * 16,
+		.uartclk	= KS8695_CLOCK_RATE * 16,
 		.fifosize	= 16,
 		.ops		= &ks8695uart_pops,
 		.flags		= ASYNC_BOOT_AUTOCONF,
diff --git a/trunk/drivers/watchdog/ks8695_wdt.c b/trunk/drivers/watchdog/ks8695_wdt.c
index 00b03eb43bf0..e1c82769b08e 100644
--- a/trunk/drivers/watchdog/ks8695_wdt.c
+++ b/trunk/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.