Merge tag 'renesas-smp-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

From Simon Horman:
Renesas ARM based SoC SMP updates for v3.12

* Per-CPU SMP boot and sleep code on SoCs that use SCU
* Shared SCU CPU Hotplug code on r8a7779 and sh73a0 SoCs
* Shared SCU CPU boot code on emev2, r8a7779 and sh73a0 SoCs

* tag 'renesas-smp-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs
  ARM: shmobile: Introduce per-CPU SMP boot / sleep code
  ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779
  ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0
  ARM: shmobile: Add shared SCU CPU Hotplug code
  ARM: shmobile: Use shared SCU SMP boot code on emev2
  ARM: shmobile: Use shared SCU SMP boot code on r8a7779
  ARM: shmobile: Use shared SCU SMP boot code on sh73a0
  ARM: shmobile: Introduce shared SCU SMP boot code

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/headsmp.S
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/common.h
Simple merge

diff --cc arch/arm/mach-shmobile/smp-emev2.c
index 78e84c5,d1c101d..522de5e
--- 1/arch/arm/mach-shmobile/smp-emev2.c
--- 2/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@@ -32,8 -32,14 +32,14 @@@
  #define EMEV2_SMU_BASE 0xe0110000
  #define SMU_GENERAL_REG0 0x7c0
  
 -static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
 +static int emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
  {
+       int ret;
+ 
+       ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+       if (ret)
+               return ret;
+ 
        arch_send_wakeup_ipi_mask(cpumask_of(cpu_logical_map(cpu)));
        return 0;
  }

diff --cc arch/arm/mach-shmobile/smp-r8a7779.c
index 42170af,c159964..0f05e9f
--- 1/arch/arm/mach-shmobile/smp-r8a7779.c
--- 2/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@@ -81,15 -81,18 +81,18 @@@ static int r8a7779_platform_cpu_kill(un
        return ret ? ret : 1;
  }
  
 -static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
 +static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
  {
        struct r8a7779_pm_ch *ch = NULL;
-       int ret = -EIO;
+       unsigned int lcpu = cpu_logical_map(cpu);
+       int ret;
  
-       cpu = cpu_logical_map(cpu);
+       ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+       if (ret)
+               return ret;
  
-       if (cpu < ARRAY_SIZE(r8a7779_ch_cpu))
-               ch = r8a7779_ch_cpu[cpu];
+       if (lcpu < ARRAY_SIZE(r8a7779_ch_cpu))
+               ch = r8a7779_ch_cpu[lcpu];
  
        if (ch)
                ret = r8a7779_sysc_power_up(ch);

diff --cc arch/arm/mach-shmobile/smp-sh73a0.c
index d2b89f7,8b3b977..0baa244
--- 1/arch/arm/mach-shmobile/smp-sh73a0.c
--- 2/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@@ -48,14 -43,19 +43,19 @@@ void __init sh73a0_register_twd(void
  }
  #endif
  
 -static int __cpuinit sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
 +static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
  {
-       cpu = cpu_logical_map(cpu);
+       unsigned int lcpu = cpu_logical_map(cpu);
+       int ret;
  
-       if (((__raw_readl(PSTR) >> (4 * cpu)) & 3) == 3)
-               __raw_writel(1 << cpu, WUPCR);  /* wake up */
+       ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+       if (ret)
+               return ret;
+ 
+       if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3)
+               __raw_writel(1 << lcpu, WUPCR); /* wake up */
        else
-               __raw_writel(1 << cpu, SRESCR); /* reset */
+               __raw_writel(1 << lcpu, SRESCR);        /* reset */
  
        return 0;
  }