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

Pull "Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman:

* r8a7740: Fix documentation error copied from elsewhere
* r8a7794: Reserve memory for CMA in a manner consistent to
           other R-Car Gen2 SoCs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-soc5-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7740 legacy: Fix copied bug in comment
  ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs

diff --combined arch/arm/mach-shmobile/pm-r8a7740.c
index 4d327de35d9bad1370e8c7060b1f8370add0d8a6,94c8815ee7c294849936dab351584b09690b5eec..7b9055093230582af6513aa9fbeceac713a9cbcb
--- 1/arch/arm/mach-shmobile/pm-r8a7740.c
--- 2/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@@ -13,12 -13,12 +13,12 @@@
  #include "common.h"
  #include "pm-rmobile.h"
  
 -#ifdef CONFIG_PM
 +#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
  static int r8a7740_pd_a4s_suspend(void)
  {
        /*
         * The A4S domain contains the CPU core and therefore it should
-        * only be turned off if the CPU is in use.
+        * only be turned off if the CPU is not in use.
         */
        return -EBUSY;
  }
@@@ -58,7 -58,8 +58,7 @@@ void __init r8a7740_init_pm_domains(voi
        rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
        pm_genpd_add_subdomain_names("A4S", "A3SP");
  }
 -
 -#endif /* CONFIG_PM */
 +#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
  
  #ifdef CONFIG_SUSPEND
  static int r8a7740_enter_suspend(suspend_state_t suspend_state)