summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/setup-r8a73a4.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2018-07-12 18:08:57 +0200
committerSimon Horman <horms+renesas@verge.net.au>2018-07-20 13:44:10 +0200
commit54f464e0c91f10212fa5699bfef1f104ee7d2213 (patch)
tree5e309b9e00f2b8474b7f111c33f45ec83fbb5c29 /arch/arm/mach-shmobile/setup-r8a73a4.c
parent8fc0d470bc77fa07632b471cec8207baf9704e32 (diff)
downloadlinux-stable-54f464e0c91f10212fa5699bfef1f104ee7d2213.tar.gz
linux-stable-54f464e0c91f10212fa5699bfef1f104ee7d2213.tar.bz2
linux-stable-54f464e0c91f10212fa5699bfef1f104ee7d2213.zip
ARM: shmobile: Always enable ARCH_TIMER on SoCs with A7 and/or A15
R-Mobile APE6, R-Car Gen2, and RZ/G1 SoCs have Cortex-A7 and/or Cortex-A15 CPU cores, all of which have ARM architectured timers. Force use of the ARM architectured timer on these SoCs. This allows to: - Remove the calls to shmobile_init_delay() from the corresponding machine vectors, - Remove a check in timer setup specific to R-Car Gen2, - Remove a check in shmobile_init_delay(). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> 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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index ef391fa368e9..23a29a0ea9c9 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -18,7 +18,6 @@ static const char *const r8a73a4_boards_compat_dt[] __initconst = {
};
DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
- .init_early = shmobile_init_delay,
.init_late = shmobile_init_late,
.dt_compat = r8a73a4_boards_compat_dt,
MACHINE_END