diff options
Diffstat (limited to 'arch/arm/mach-ux500/timer.c')
-rw-r--r-- | arch/arm/mach-ux500/timer.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 875309acb022..a6af0b8732ba 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c | |||
@@ -17,6 +17,8 @@ | |||
17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
18 | #include <mach/irqs.h> | 18 | #include <mach/irqs.h> |
19 | 19 | ||
20 | #include "id.h" | ||
21 | |||
20 | #ifdef CONFIG_HAVE_ARM_TWD | 22 | #ifdef CONFIG_HAVE_ARM_TWD |
21 | static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer, | 23 | static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer, |
22 | U8500_TWD_BASE, IRQ_LOCALTIMER); | 24 | U8500_TWD_BASE, IRQ_LOCALTIMER); |
@@ -46,7 +48,7 @@ const static struct of_device_id prcmu_timer_of_match[] __initconst = { | |||
46 | { }, | 48 | { }, |
47 | }; | 49 | }; |
48 | 50 | ||
49 | static void __init ux500_timer_init(void) | 51 | void __init ux500_timer_init(void) |
50 | { | 52 | { |
51 | void __iomem *mtu_timer_base; | 53 | void __iomem *mtu_timer_base; |
52 | void __iomem *prcmu_timer_base; | 54 | void __iomem *prcmu_timer_base; |
@@ -99,14 +101,3 @@ dt_fail: | |||
99 | clksrc_dbx500_prcmu_init(prcmu_timer_base); | 101 | clksrc_dbx500_prcmu_init(prcmu_timer_base); |
100 | ux500_twd_init(); | 102 | ux500_twd_init(); |
101 | } | 103 | } |
102 | |||
103 | static void ux500_timer_reset(void) | ||
104 | { | ||
105 | nmdk_clkevt_reset(); | ||
106 | nmdk_clksrc_reset(); | ||
107 | } | ||
108 | |||
109 | struct sys_timer ux500_timer = { | ||
110 | .init = ux500_timer_init, | ||
111 | .resume = ux500_timer_reset, | ||
112 | }; | ||