summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2016-06-28 16:10:39 +0200
committerSimon Horman <horms+renesas@verge.net.au>2016-06-29 14:43:40 +0200
commitf89a51700d7ae0ef58956a8c8f0e2c68767bcdae (patch)
treeb4b468eec11cd6dd3b0a916959d9a350ccabe174 /arch/arm/mach-shmobile
parentf5d70b9cee2282ecbd98c60e5faf46a896c188a3 (diff)
downloadlinux-f89a51700d7ae0ef58956a8c8f0e2c68767bcdae.tar.gz
linux-f89a51700d7ae0ef58956a8c8f0e2c68767bcdae.tar.xz
ARM: shmobile: r8a7791: Prioritize DT APMU support
Adjust the r8a7791 SoC support code to not configure any non-DT SMP code in case the DT-based enable-method has been installed already. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> 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')
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7791.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 3b8dbaf07777..110e8b588e56 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -29,6 +29,7 @@ static const char *const r8a7791_boards_compat_dt[] __initconst = {
};
DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
+ .smp_init = shmobile_smp_init_fallback_ops,
.smp = smp_ops(r8a7791_smp_ops),
.init_early = shmobile_init_delay,
.init_time = rcar_gen2_timer_init,