From e6a7f879a94c5495e2c2ab11e38acb2f5799e2cf Mon Sep 17 00:00:00 2001
From: Jonas Aaberg <jonas.aberg@stericsson.com>
Date: Wed, 21 Sep 2011 07:47:02 +0200
Subject: [PATCH] --- yaml --- r: 272683 b: refs/heads/master c:
 bb219dba0d1e46324ea462ba42f6fd8e9b7471de h: refs/heads/master i:   272681:
 a2f748bf945df6c18c3a7f941a76843a3df64ad1   272679:
 bb2e25e57b677d908cfd89155925495b073b8a8f v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-ux500/timer.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 774694964f52..133cdfef5462 100644
--- 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
index 36a82bf57d55..08c55a53cb83 100644
--- 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,
 };