Commit 57e33ff1 authored Sep 25, 2014 by Arnd Bergmann

Merge tag 'renesas-soc5-for-v3.18' of...

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

parents a508698e 8237f9e5

arch/arm/mach-shmobile/pm-r8a7740.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

arch/arm/mach-shmobile/setup-r8a7794.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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