From dc26aaf68ead9904c585335fae4cd93e74107eb8 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Tue, 29 Jan 2013 20:56:17 -0700
Subject: [PATCH] --- yaml --- r: 355246 b: refs/heads/master c:
 80debae58435423def63632273139ee5fcb99c69 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-imx/imx31-dt.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d744f401404e..0aead9eacf3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db1c8172eeca18246b3362d86a4567f4049d07d2
+refs/heads/master: 80debae58435423def63632273139ee5fcb99c69
diff --git a/trunk/arch/arm/mach-imx/imx31-dt.c b/trunk/arch/arm/mach-imx/imx31-dt.c
index f9a690960097..b5c04eece780 100644
--- a/trunk/arch/arm/mach-imx/imx31-dt.c
+++ b/trunk/arch/arm/mach-imx/imx31-dt.c
@@ -43,12 +43,17 @@ static const char *imx31_dt_board_compat[] __initdata = {
 	NULL
 };
 
+static void __init imx31_dt_timer_init(void)
+{
+	mx31_clocks_init_dt();
+}
+
 DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")
 	.map_io		= mx31_map_io,
 	.init_early	= imx31_init_early,
 	.init_irq	= mx31_init_irq,
 	.handle_irq	= imx31_handle_irq,
-	.init_time	= mx31_clocks_init_dt,
+	.init_time	= imx31_dt_timer_init,
 	.init_machine	= imx31_dt_init,
 	.dt_compat	= imx31_dt_board_compat,
 	.restart	= mxc_restart,