diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 09:43:40 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 09:43:40 -0700 |
| commit | e1ddcdef841f68d175b1a4a5c91d55f383ce5241 (patch) | |
| tree | 69122e47ea903b99c5e7a6c871deb7717663bf5f /arch/arm/mach-shmobile/setup-r8a7790.c | |
| parent | edf4f16f2709abcce37f10ac0c64d06d540ed6b2 (diff) | |
| parent | 113522ee3034427472bcb4b8665833719809b31a (diff) | |
Merge branch 'renesas/cleanup2' into next/soc
Merging in as base to resolve a merge conflict with later soc branch
locally.
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7790.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7790.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index e1907686ace4..c37d82d38617 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -26,11 +26,13 @@ #include <linux/serial_sci.h> #include <linux/sh_dma.h> #include <linux/sh_timer.h> -#include <mach/r8a7790.h> + #include <asm/mach/arch.h> + #include "common.h" #include "dma-register.h" #include "irqs.h" +#include "r8a7790.h" #include "rcar-gen2.h" /* Audio-DMAC */ @@ -308,13 +310,6 @@ void __init r8a7790_add_standard_devices(void) r8a7790_register_audio_dmac(1); } -void __init r8a7790_init_early(void) -{ -#ifndef CONFIG_ARM_ARCH_TIMER - shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */ -#endif -} - #ifdef CONFIG_USE_OF static const char * const r8a7790_boards_compat_dt[] __initconst = { @@ -324,7 +319,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = { DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") .smp = smp_ops(r8a7790_smp_ops), - .init_early = r8a7790_init_early, + .init_early = shmobile_init_delay, .init_time = rcar_gen2_timer_init, .init_late = shmobile_init_late, .reserve = rcar_gen2_reserve, |