diff options
| author | Magnus Damm <damm@opensource.se> | 2013-06-28 11:27:13 (GMT) |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-17 05:26:53 (GMT) |
| commit | 8333d8c995169e489a81241bd632a4b9370ed7c3 (patch) | |
| tree | a73b42d1be1cc4abe8858c3adb1de903af22c294 /arch/arm/mach-shmobile/setup-r8a7790.c | |
| parent | 99ade1a0f02e086248874d9908def3e8e4539418 (diff) | |
| download | linux-8333d8c995169e489a81241bd632a4b9370ed7c3.tar.xz | |
ARM: shmobile: Make r8a7790 Arch timer optional
Update the r8a7790 code to allow using other
timers than Arch timer for clock events.
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-r8a7790.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7790.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index ece60c6..f01542e 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -208,6 +208,13 @@ void __init r8a7790_timer_init(void) shmobile_timer_init(); } +void __init r8a7790_init_delay(void) +{ +#ifndef CONFIG_ARM_ARCH_TIMER + shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */ +#endif +} + #ifdef CONFIG_USE_OF static const char *r8a7790_boards_compat_dt[] __initdata = { @@ -216,6 +223,7 @@ static const char *r8a7790_boards_compat_dt[] __initdata = { }; DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") + .init_early = r8a7790_init_delay, .init_time = r8a7790_timer_init, .dt_compat = r8a7790_boards_compat_dt, MACHINE_END |