From patchwork Thu Sep 22 13:47:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 4269 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 395E223EFA for ; Thu, 22 Sep 2011 13:47:17 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 2D831A18077 for ; Thu, 22 Sep 2011 13:47:17 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so3864669fxe.11 for ; Thu, 22 Sep 2011 06:47:17 -0700 (PDT) Received: by 10.223.61.66 with SMTP id s2mr3069792fah.27.1316699236975; Thu, 22 Sep 2011 06:47:16 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs169018lad; Thu, 22 Sep 2011 06:47:16 -0700 (PDT) Received: by 10.14.22.145 with SMTP id t17mr802971eet.211.1316699236330; Thu, 22 Sep 2011 06:47:16 -0700 (PDT) Received: from eu1sys200aog113.obsmtp.com (eu1sys200aog113.obsmtp.com. [207.126.144.135]) by mx.google.com with SMTP id h50si2551626eea.140.2011.09.22.06.47.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 06:47:16 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.135; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.135 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob113.postini.com ([207.126.147.11]) with SMTP ID DSNKTns8XzQcMYM0nVdp7xSOfZh0LfSVtLl0@postini.com; Thu, 22 Sep 2011 13:47:15 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id B3536E5; Thu, 22 Sep 2011 13:38:38 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 93341D2A; Thu, 22 Sep 2011 13:47:08 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 7FF7A24C075; Thu, 22 Sep 2011 15:47:00 +0200 (CEST) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 22 Sep 2011 15:47:07 +0200 From: Linus Walleij To: Cc: Lee Jones , Jonas Aaberg , Thomas Gleixner , Linus Walleij Subject: [PATCH 7/7] ARM: ux500: Reprogram timers upon resume Date: Thu, 22 Sep 2011 15:47:05 +0200 Message-ID: <1316699225-21459-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 From: Jonas Aaberg 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 Signed-off-by: Jonas Aaberg Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/timer.c | 7 +++++++ 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, };