Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5c86ce authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-for-v4.1' of... 

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

Pull "Renesas ARM Based SoC Updates for v4.1" from Simon Horman:

* Do not make CMA reservation for R-Car Gen2 when HIGHMEM=n

* tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: No R-Car Gen2 CMA reservation when HIGHMEM=n
parents 13a7a6ac 744cadba

arch/arm/mach-shmobile/setup-rcar-gen2.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/dma-contiguous.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/memblock.h>

#include <linux/of.h>

#include <linux/of_fdt.h>

#include <asm/mach/arch.h>
@@ -199,7 +200,7 @@ void __init rcar_gen2_reserve(void) 


	of_scan_flat_dt(rcar_gen2_scan_mem, &mrc);

#ifdef CONFIG_DMA_CMA

	if (mrc.size)

	if (mrc.size && memblock_is_region_memory(mrc.base, mrc.size))

		dma_contiguous_reserve_area(mrc.size, mrc.base, 0,

					    &rcar_gen2_dma_contiguous, true);

#endif