| From 00d68bd635708b7886d62a3216cc2dc748e3c500 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Mon, 10 Jun 2013 18:20:15 +0900 |
| Subject: ARM: shmobile: EMEV2 SMP with SCU boot fn and args |
| |
| Let EMEV2 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> |
| (cherry picked from commit a188bfcafa61f600877f3e2b4a27cbe42b72c818) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/smp-emev2.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c |
| index e38691b4..80991b35 100644 |
| --- a/arch/arm/mach-shmobile/smp-emev2.c |
| +++ b/arch/arm/mach-shmobile/smp-emev2.c |
| @@ -40,8 +40,10 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus) |
| { |
| scu_enable(shmobile_scu_base); |
| |
| - /* Tell ROM loader about our vector (in headsmp-scu.S) */ |
| - emev2_set_boot_vector(__pa(shmobile_secondary_vector_scu)); |
| + /* Tell ROM loader about our vector (in headsmp-scu.S, headsmp.S) */ |
| + emev2_set_boot_vector(__pa(shmobile_boot_vector)); |
| + 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); |
| -- |
| 1.8.4.3.gca3854a |
| |
