aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/setup-r8a73a4.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-06-28 07:27:32 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-07-17 01:26:54 -0400
commitb9a30ef1d354c0bc0cc6d973bbe7ede9f00716ee (patch)
treeb12d3e0d03e3d353d7f2b0b0d7c26d4f2e535bb2 /arch/arm/mach-shmobile/setup-r8a73a4.c
parenta7b99f27a260a25f856ea37090cea997d50fe112 (diff)
ARM: shmobile: Make r8a73a4 Arch timer optional
Update the r8a73a4 code to allow using other timers than Arch timer for clock event Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a73a4.c')
-rw-r--r--arch/arm/mach-shmobile/setup-r8a73a4.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index b8dddf4a7ae9..d533bd23865c 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -202,6 +202,13 @@ void __init r8a73a4_add_standard_devices(void)
202 r8a7790_register_cmt(10); 202 r8a7790_register_cmt(10);
203} 203}
204 204
205void __init r8a73a4_init_delay(void)
206{
207#ifndef CONFIG_ARM_ARCH_TIMER
208 shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */
209#endif
210}
211
205#ifdef CONFIG_USE_OF 212#ifdef CONFIG_USE_OF
206void __init r8a73a4_add_standard_devices_dt(void) 213void __init r8a73a4_add_standard_devices_dt(void)
207{ 214{
@@ -215,6 +222,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
215}; 222};
216 223
217DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)") 224DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
225 .init_early = r8a73a4_init_delay,
218 .init_machine = r8a73a4_add_standard_devices_dt, 226 .init_machine = r8a73a4_add_standard_devices_dt,
219 .init_time = shmobile_timer_init, 227 .init_time = shmobile_timer_init,
220 .dt_compat = r8a73a4_boards_compat_dt, 228 .dt_compat = r8a73a4_boards_compat_dt,