aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson2013-02-09 16:49:29 -0800
committerOlof Johansson2013-02-09 16:49:29 -0800
commite2efc25ac21ff3c8ead9670dffba40926aa54ad7 (patch)
treeef77f8743cb80bf9d5b0e5512e8c69d9e25b7a97
parent1087f4dbf368d7d800a1cae5b85aa600629d36e3 (diff)
parentdbe1c3defb3844772634446492ea6c13882596ec (diff)
Merge tag 'renesas-soc4-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
From Simon Horman: Fourth round of Renesas ARM-based SoC changes for v3.9 Register ARM architected timer. This is preparatory work by Magnus Damm for SoC(s) that use the ARM architected timer. * tag 'renesas-soc4-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Register ARM architected timer
-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 @@
*/
#include <linux/platform_device.h>
#include <linux/delay.h>
+#include <asm/arch_timer.h>
#include <asm/mach/time.h>
#include <asm/smp_twd.h>
@@ -62,4 +63,6 @@ void __init shmobile_earlytimer_init(void)
void __init shmobile_timer_init(void)
{
+ arch_timer_of_register();
+ arch_timer_sched_clock_init();
}