summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMagnus Damm2013-06-10 11:19:56 +0200
committerSimon Horman2013-06-17 09:07:27 +0200
commitaf642310aaa491df6dabcca96bdf0d1b8465a834 (patch)
tree67e6094ccbf9a51426449d2943e1e46989afe471 /arch/arm
parentARM: shmobile: Add SCU boot function using argument (diff)
downloadkernel-qcow2-linux-af642310aaa491df6dabcca96bdf0d1b8465a834.tar.gz
kernel-qcow2-linux-af642310aaa491df6dabcca96bdf0d1b8465a834.tar.xz
kernel-qcow2-linux-af642310aaa491df6dabcca96bdf0d1b8465a834.zip
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/smp-r8a7779.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index a853bf182ed5..526cfaae81c1 100644
--- 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);