openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: Xilinx Zynq patches for v4.10 

- Fix dma issue
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlhGsk8ACgkQykllyylKDCFJlQCeKhBp/gd/4EEuxT0ovvcWqeoS
 W30An2dhQX9/6MpJT+sLiR09RUzngdFI
 =PvhL
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2016-12-07 12:35:46 -08:00
parent 9442091ed0 7a3cc2a7b2
commit 44c29b83de
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-zynq/common.c
View File

@ -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 = {