From 78c71dba74d5aeef25172407e20e7463a144647d Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 18 Dec 2008 11:24:03 +0100
Subject: [PATCH] --- yaml --- r: 123917 b: refs/heads/master c:
 44421e42587125acf70771436bcd6af06e1261a3 h: refs/heads/master i:   123915:
 5664cbcb23abdd8074bb22cd4256e6ef6f81c268 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/plat-mxc/include/mach/mx1.h   | 5 -----
 trunk/arch/arm/plat-mxc/include/mach/mx27.h  | 3 ---
 trunk/arch/arm/plat-mxc/include/mach/mx31.h  | 5 -----
 trunk/arch/arm/plat-mxc/include/mach/timex.h | 8 +++++++-
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index b1c88ceb42a2..87dc8e9e7612 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d631b835f518848b7f3ce803bfd00dc1bb8a5b1
+refs/heads/master: 44421e42587125acf70771436bcd6af06e1261a3
diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx1.h b/trunk/arch/arm/plat-mxc/include/mach/mx1.h
index c45bf5f5b90c..8476a15dbfc0 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/mx1.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/mx1.h
@@ -18,11 +18,6 @@
 
 #include <mach/vmalloc.h>
 
-/*
- * defines the hardware clock tick rate
- */
-#define CLOCK_TICK_RATE	16000000
-
 #define PHYS_OFFSET	UL(0x08000000)
 
 /*
diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx27.h b/trunk/arch/arm/plat-mxc/include/mach/mx27.h
index 55bcbd5e073a..ae8637471ae8 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/mx27.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/mx27.h
@@ -289,9 +289,6 @@ extern int mx27_revision(void);
 /* this CPU supports up to 192 GPIOs (don't forget the baseboard!) */
 #define ARCH_NR_GPIOS		(192 + 16)
 
-/* OS clock tick rate */
-#define CLOCK_TICK_RATE         13300000
-
 /* Start of RAM */
 #define PHYS_OFFSET		SDRAM_BASE_ADDR
 
diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx31.h b/trunk/arch/arm/plat-mxc/include/mach/mx31.h
index 65c3109b5192..2f6d9fc0ab23 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/mx31.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/mx31.h
@@ -15,11 +15,6 @@
 #error "Do not include directly."
 #endif
 
-/*!
- * defines the hardware clock tick rate
- */
-#define CLOCK_TICK_RATE		16625000
-
 /*
  * MX31 memory map:
  *
diff --git a/trunk/arch/arm/plat-mxc/include/mach/timex.h b/trunk/arch/arm/plat-mxc/include/mach/timex.h
index 0b0af0253e91..07b4a73c9d2f 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/timex.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/timex.h
@@ -20,6 +20,12 @@
 #ifndef __ASM_ARCH_MXC_TIMEX_H__
 #define __ASM_ARCH_MXC_TIMEX_H__
 
-#include <mach/hardware.h>	/* for CLOCK_TICK_RATE */
+#if defined CONFIG_ARCH_MX1
+#define CLOCK_TICK_RATE		16000000
+#elif defined CONFIG_ARCH_MX2
+#define CLOCK_TICK_RATE		13300000
+#elif defined CONFIG_ARCH_MX3
+#define CLOCK_TICK_RATE		16625000
+#endif
 
 #endif				/* __ASM_ARCH_MXC_TIMEX_H__ */