[ARM] MXC: do not include mach/hardware.h from mach/timex.h

Instead of including other header files, define CLOCK_TICK_RATE directly

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --git a/arch/arm/plat-mxc/include/mach/mx1.h b/arch/arm/plat-mxc/include/mach/mx1.h
index c45bf5f5b90c841994203dd5d1b3c79dca167ece..8476a15dbfc05122ba2198294253896fb22e95d3 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx1.h
+++ b/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/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h
index 55bcbd5e073a3b4352d54566d433a648cd6e56b8..ae8637471ae8c38ac7d31aa25fe5aef794da27dc 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx27.h
+++ b/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/arch/arm/plat-mxc/include/mach/mx31.h b/arch/arm/plat-mxc/include/mach/mx31.h
index 65c3109b51928b4f33ca979dc430ed3c5fc222a0..2f6d9fc0ab23dba862d50d81d5c1b4571db49b18 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx31.h
+++ b/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/arch/arm/plat-mxc/include/mach/timex.h b/arch/arm/plat-mxc/include/mach/timex.h
index 0b0af0253e912124d69cb4eacaedf7c1703b2ecf..07b4a73c9d2f3135400e3b6aa8ac889c4a352758 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/timex.h
+++ b/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__ */