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

Merge "Second Round of Renesas ARM Based SoC Updates for v3.17" from Simon
Horman:

* Suspend on non-SMP update for r8a7790
* Move r8a7791.h out of mach directory.
  This is part of a multi-stage effort to move headers
  out of that directory.

* tag 'renesas-soc2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Allow r8a7791 to build non-SMP APMU code
  ARM: shmobile: Move r8a7791 reset code to pm-r8a7791.c
  ARM: shmobile: Allow r8a7790 to build non-SMP APMU code
  ARM: shmobile: Move r8a7790 reset code to pm-r8a7790.c
  ARM: shmobile: Use __init for APMU suspend init function
  ARM: shmobile: Adjust APMU code to build for non-SMP
  ARM: shmobile: Allow use of boot code for non-SMP case
  ARM: shmobile: Move r8a7791.h

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

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

diff --cc arch/arm/mach-shmobile/pm-r8a7790.c
index 8845433a00b397fbed775de1bdbdc9afc9d2e55d,2f3c25080738793fbd73153c24b3aceb7270f3d0..80e8d95e54d3b8846c52f91c0d2d89f1907d6a39
--- 1/arch/arm/mach-shmobile/pm-r8a7790.c
--- 2/arch/arm/mach-shmobile/pm-r8a7790.c
+++ b/arch/arm/mach-shmobile/pm-r8a7790.c
@@@ -11,12 -11,22 +11,22 @@@
   */
  
  #include <linux/kernel.h>
- 
+ #include <linux/smp.h>
  #include <asm/io.h>
- 
 -#include <mach/r8a7790.h>
+ #include "common.h"
  #include "pm-rcar.h"
 +#include "r8a7790.h"
  
+ /* RST */
+ #define RST           0xe6160000
+ #define CA15BAR               0x0020
+ #define CA7BAR                0x0030
+ #define CA15RESCNT    0x0040
+ #define CA7RESCNT     0x0044
+ 
+ /* On-chip RAM */
+ #define MERAM          0xe8080000
+ 
  /* SYSC */
  #define SYSCIER 0x0c
  #define SYSCIMR 0x10

diff --cc arch/arm/mach-shmobile/smp-r8a7790.c
index ad66beab2ea6cfc4f24d9b856373ccfbf7b6b3d5,1e254f995ea7f96ef3a828d4fce3280bf94b9db6..2311694636e123a984fe8f1480d2a9efb7c9a412
--- 1/arch/arm/mach-shmobile/smp-r8a7790.c
--- 2/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@@ -17,20 -17,11 +17,13 @@@
  #include <linux/init.h>
  #include <linux/smp.h>
  #include <linux/io.h>
 +
  #include <asm/smp_plat.h>
 -#include <mach/r8a7790.h>
 +
  #include "common.h"
  #include "pm-rcar.h"
 +#include "r8a7790.h"
  
- #define RST           0xe6160000
- #define CA15BAR               0x0020
- #define CA7BAR                0x0030
- #define CA15RESCNT    0x0040
- #define CA7RESCNT     0x0044
- #define MERAM         0xe8080000
- 
  static struct rcar_sysc_ch r8a7790_ca15_scu = {
        .chan_offs = 0x180, /* PWRSR5 .. PWRER5 */
        .isr_bit = 12, /* CA15-SCU */