Commit 44c29b83 authored by Olof Johansson's avatar 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: default avatarOlof Johansson <olof@lixom.net>
parents 9442091e 7a3cc2a7
...@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base; ...@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base;
static void __init zynq_memory_init(void) static void __init zynq_memory_init(void)
{ {
if (!__pa(PAGE_OFFSET)) 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 = { static struct platform_device zynq_cpuidle_device = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment