aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-02-05 02:30:49 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-02-05 03:13:55 -0500
commitdbe1c3defb3844772634446492ea6c13882596ec (patch)
tree6fc9cd123416adfe18484ce726d84a9106f3925d
parent58079fa7d54a0929d304054ee759187a2ccd3cdf (diff)
ARM: shmobile: Register ARM architected timer
Register ARM architected timer by default for all mach-shmobile systems using late timer. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/timer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index fdbe54a11555..3d16d4dff01b 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -20,6 +20,7 @@
20 */ 20 */
21#include <linux/platform_device.h> 21#include <linux/platform_device.h>
22#include <linux/delay.h> 22#include <linux/delay.h>
23#include <asm/arch_timer.h>
23#include <asm/mach/time.h> 24#include <asm/mach/time.h>
24#include <asm/smp_twd.h> 25#include <asm/smp_twd.h>
25 26
@@ -62,4 +63,6 @@ void __init shmobile_earlytimer_init(void)
62 63
63void __init shmobile_timer_init(void) 64void __init shmobile_timer_init(void)
64{ 65{
66 arch_timer_of_register();
67 arch_timer_sched_clock_init();
65} 68}