aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-07 17:07:45 -0700
committerStephen Warren <swarren@nvidia.com>2012-12-24 09:36:36 -0700
commit8726e96fcb29298351c777670742b553ca947508 (patch)
tree5eb74fd3695b098832457253a4cead304477b625 /arch/arm/mach-ux500
parente3cbfb6213757429694775aa7e97ee80c98ee2c6 (diff)
downloadkernel_goldelico_gta04-8726e96fcb29298351c777670742b553ca947508.zip
kernel_goldelico_gta04-8726e96fcb29298351c777670742b553ca947508.tar.gz
kernel_goldelico_gta04-8726e96fcb29298351c777670742b553ca947508.tar.bz2
ARM: ux500: convert timer suspend/resume to clock_event_device
Move ux500's timer suspend/resume functions from struct sys_timer ux500_timer into struct clock_event_device nmdk_clkevt. This will allow the sys_timer suspend/resume fields to be removed, and eventually lead to a complete removal of struct sys_timer. Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/timer.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 875309a..46a7244 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -100,13 +100,6 @@ dt_fail:
ux500_twd_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,
};