---

yaml --- r: 272683 b: refs/heads/master c: bb219db h: refs/heads/master i: 272681: a2f748b 272679: bb2e25e v: v3
git-mirror · Sep 22, 2011 · e6a7f87 · e6a7f87
1 parent 02fb620
commit e6a7f87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05387a9fbf334174e0f84fa77e493c1a804993c9
+refs/heads/master: bb219dba0d1e46324ea462ba42f6fd8e9b7471de
diff --git a/trunk/arch/arm/mach-ux500/timer.c b/trunk/arch/arm/mach-ux500/timer.c
@@ -53,6 +53,13 @@ static void __init ux500_timer_init(void)
 	clksrc_dbx500_prcmu_init();
 }
 
+static void ux500_timer_reset(void)
+{
+	nmdk_clkevt_reset();
+	nmdk_clksrc_reset();
+}
+
 struct sys_timer ux500_timer = {
 	.init		= ux500_timer_init,
+	.resume		= ux500_timer_reset,
 };