summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-09-21 07:47:02 +0200
committerLinus Walleij <linus.walleij@linaro.org>2011-09-22 15:44:23 +0200
commitbb219dba0d1e46324ea462ba42f6fd8e9b7471de (patch)
treea68caf20643ed4cd27ed683f29a75c31d89ad77c
parent05387a9fbf334174e0f84fa77e493c1a804993c9 (diff)
downloadop-kernel-dev-bb219dba0d1e46324ea462ba42f6fd8e9b7471de.zip
op-kernel-dev-bb219dba0d1e46324ea462ba42f6fd8e9b7471de.tar.gz
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>
-rw-r--r--arch/arm/mach-ux500/timer.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 36a82bf..08c55a5 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,
};
OpenPOWER on IntegriCloud