From bd988b6183da29a9b73f3e84c996ab0476d1ae95 Mon Sep 17 00:00:00 2001
From: Juergen Beisert <j.beisert@pengutronix.de>
Date: Sat, 5 Jul 2008 10:02:53 +0200
Subject: [PATCH] --- yaml --- r: 100880 b: refs/heads/master c:
 9e8a30dce1bd38cf7b941c707da504d28a907f5c h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/mach-mx3/mx31lite.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 454626d8086d..2ea17bf43e2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4cd7a5c836e189a1712c9ffd2d76b2302ce212
+refs/heads/master: 9e8a30dce1bd38cf7b941c707da504d28a907f5c
diff --git a/trunk/arch/arm/mach-mx3/mx31lite.c b/trunk/arch/arm/mach-mx3/mx31lite.c
index ea23a8ec6850..1372c1a1fc3f 100644
--- a/trunk/arch/arm/mach-mx3/mx31lite.c
+++ b/trunk/arch/arm/mach-mx3/mx31lite.c
@@ -26,6 +26,7 @@
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/time.h>
 #include <asm/mach/map.h>
 #include <asm/arch/common.h>
 #include <asm/page.h>
@@ -79,6 +80,16 @@ static void __init mxc_board_init(void)
 {
 }
 
+static void __init mx31lite_timer_init(void)
+{
+	mxc_clocks_init(26000000);
+	mxc_timer_init("ipg_clk.0");
+}
+
+struct sys_timer mx31lite_timer = {
+	.init	= mx31lite_timer_init,
+};
+
 /*
  * The following uses standard kernel macros defined in arch.h in order to
  * initialize __mach_desc_MX31LITE data structure.
@@ -92,5 +103,5 @@ MACHINE_START(MX31LITE, "LogicPD MX31 LITEKIT")
 	.map_io         = mx31lite_map_io,
 	.init_irq       = mxc_init_irq,
 	.init_machine   = mxc_board_init,
-	.timer          = &mxc_timer,
+	.timer          = &mx31lite_timer,
 MACHINE_END