Commit 44c29b83 authored Dec 07, 2016 by Olof Johansson

Merge tag 'zynq-soc-for-4.10' of https://github.com/Xilinx/linux-xlnx into next/soc

arm: Xilinx Zynq patches for v4.10

- Fix dma issue

* tag 'zynq-soc-for-4.10' of https://github.com/Xilinx/linux-xlnx

:
  ARM: zynq: Reserve correct amount of non-DMA RAM

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 9442091e 7a3cc2a7

arch/arm/mach-zynq/common.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base;
		static void __init zynq_memory_init(void)
		{
		if (!__pa(PAGE_OFFSET))
		memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir));
		memblock_reserve(__pa(PAGE_OFFSET), 0x80000);
		}

		static struct platform_device zynq_cpuidle_device = {