ARM: shmobile: r8a7779 SMP with SCU boot fn and args

Let r8a7779 make use of shmobile_boot_fn and shmobile_boot_arg
together with shmobile_boot_scu and the SCU base address.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index a853bf1..526cfaa 100644 (file)
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -101,8 +101,10 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
 {
        scu_enable(shmobile_scu_base);
 
-       /* Map the reset vector (in headsmp-scu.S) */
-       __raw_writel(__pa(shmobile_secondary_vector_scu), AVECR);
+       /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
+       __raw_writel(__pa(shmobile_boot_vector), AVECR);
+       shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
+       shmobile_boot_arg = (unsigned long)shmobile_scu_base;
 
        /* enable cache coherency on booting CPU */
        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);