From d79b874114e6c38612cea5f2c910b3984107220c Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sun, 29 Apr 2012 00:02:37 +0800
Subject: [PATCH] --- yaml --- r: 308259 b: refs/heads/master c:
 39d1367e11e406ddb9bcd5f2e4798f3c355db7d9 h: refs/heads/master i:   308257:
 34c465aee224f4e74fd98de43d826b49cb9fcf73   308255:
 da1edb657c11ab79bebb39c1848ff3b39005aeb9 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-mxs/timer.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 239e1f801845..ba129bf8f3ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d81397cd93da2850e0aec54c3ba4eb4908a675b
+refs/heads/master: 39d1367e11e406ddb9bcd5f2e4798f3c355db7d9
diff --git a/trunk/arch/arm/mach-mxs/timer.c b/trunk/arch/arm/mach-mxs/timer.c
index 564a63279f18..575e8fd6bc79 100644
--- a/trunk/arch/arm/mach-mxs/timer.c
+++ b/trunk/arch/arm/mach-mxs/timer.c
@@ -20,6 +20,7 @@
  * MA 02110-1301, USA.
  */
 
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/clockchips.h>
@@ -245,6 +246,14 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
 
 void __init mxs_timer_init(struct clk *timer_clk, int irq)
 {
+	if (!timer_clk) {
+		timer_clk = clk_get_sys("timrot", NULL);
+		if (IS_ERR(timer_clk)) {
+			pr_err("%s: failed to get clk\n", __func__);
+			return;
+		}
+	}
+
 	clk_prepare_enable(timer_clk);
 
 	/*