diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:10:40 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:10:40 +0200 |
| commit | 57e33ff1dba139a70723e922c5838499610b60c1 (patch) | |
| tree | e4009d05383590b9f9ee4f2b2a7a3e065f4fbb59 | |
| parent | a508698e6bbe38a3f34dd7e611931c0c8fabc213 (diff) | |
| parent | 8237f9e5c38098aeb8570a77bacd0fe0ebc61dfa (diff) | |
| download | linux-57e33ff1dba139a70723e922c5838499610b60c1.tar.bz2 | |
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
| -rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7740.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7794.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c index 4d327de35d9b..7b9055093230 100644 --- a/arch/arm/mach-shmobile/pm-r8a7740.c +++ b/arch/arm/mach-shmobile/pm-r8a7740.c @@ -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; } diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c index c10acd125aec..d2b093033132 100644 --- a/arch/arm/mach-shmobile/setup-r8a7794.c +++ b/arch/arm/mach-shmobile/setup-r8a7794.c @@ -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 |