summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2016-06-28 16:10:38 +0200
committerSimon Horman <horms+renesas@verge.net.au>2016-06-29 14:43:26 +0200
commitf5d70b9cee2282ecbd98c60e5faf46a896c188a3 (patch)
tree751cbabedec6cb332ad9aa30a119fc0405a4fb3c
parentc21af444eace56619e33df0b1fc67ec2e33481ac (diff)
ARM: shmobile: r8a7790: Prioritize DT APMU support
Adjust the r8a7790 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>
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7790.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 3a18af4922b4..3506327e0bed 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -28,6 +28,7 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = {
};
DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
+ .smp_init = shmobile_smp_init_fallback_ops,
.smp = smp_ops(r8a7790_smp_ops),
.init_early = shmobile_init_delay,
.init_time = rcar_gen2_timer_init,