Fifth Round of Renesas ARM Based SoC Soc Updates for v3.18

* r8a7740: Fix documentation error coppied from elsewhere
 * r8a7794: Reserve memory for CMA in a manner consistent to
            other R-Car Gen2 SoCs
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUG61hAAoJENfPZGlqN0++YrEP/2AUMZCOUlKOz71JMS9d26vD
 g64wXv8SEezY+RwBnxO2CNNPGUQf+3RjGNIyEhE62PbF7y6RcDz6sFxhR7FKrnf4
 aDFC/fyh2jot3lsPmEv8fBH94FkmAao/dyO6nAlaJ64ACGDoApecWlL3KFBG6i7a
 QRB3e+tRetGEHQsdlwLrap8SJN0YigkjFKorOVHEAHnQlNnULCRYcGgJo742jGyr
 6IEiZUGn5OOWWRtiTWs1oWQbMsnbHmgG4l6/51NKkuD/uoxq7gMbBiHu9ht5npmo
 e5zPQ+1ILA9hI43Mk52vfilNXdBn7urTjc6CtROXWBer35smJ5kpxj5WSKpT7jTN
 MXENqilQiYeTbP5GR3p96p4JiL2U3Zd+frxfsPOMgyfvTGEdYFULfuXgblgwEGv2
 RC/8AB8lfcnwPnkI1C21GR2Zbt7bw8ytJD9iQoTb1GEqyVMd/Oxrp0S+/Zk9EoVW
 w+3fCRJrBQVmTDi9XArqt5IgpjloZndfkwVX6J45/KJu4/gFCv1AKYSw7bD/rNrD
 cZzDYtkj9DbO125gDDfyJo+jMOMJGVUnHv9XSLgBpUbaEKfa9oh2hpwPoM0C/OS5
 KHMISR2rFu4vVteLlANLODSFoprM1Xyd4NDFqp5bdwN7RoMZFLOHHwlzmMXn/Xc8
 lladCk6BwpEkOUYYriG3
 =wfDI
 -----END PGP SIGNATURE-----

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

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
This commit is contained in:
Arnd Bergmann 2014-09-25 18:10:40 +02:00
commit 57e33ff1db
2 changed files with 2 additions and 1 deletions

View file

@ -18,7 +18,7 @@ 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;
}

View file

@ -28,5 +28,6 @@ DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")
.init_early = shmobile_init_delay,
.init_late = shmobile_init_late,
.init_time = rcar_gen2_timer_init,
.reserve = rcar_gen2_reserve,
.dt_compat = r8a7794_boards_compat_dt,
MACHINE_END