From bb219dba0d1e46324ea462ba42f6fd8e9b7471de 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] ARM: ux500: Reprogram timers upon resume

On ux500 the MTU timer blocks are powered off during
suspend/resume, so these need some reinitialization when
coming back from suspend.

Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-ux500/timer.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 36a82bf57d55..08c55a53cb83 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/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,
 };
-- 
2.39.5