From: CMY <cmy@rock-chips.com>
Date: Mon, 2 Mar 2015 03:44:54 +0000 (+0800)
Subject: arm64: mm: reserve memory region for uboot
X-Git-Tag: firefly_0821_release~4158^2~429
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b094d9d58dd393cce91dfb66859c54df26b745a;p=firefly-linux-kernel-4.4.55.git

arm64: mm: reserve memory region for uboot

Signed-off-by: CMY <cmy@rock-chips.com>
---

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index ea0c0812ef8e..5c06413183f0 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -39,6 +39,10 @@
 #include <asm/sizes.h>
 #include <asm/tlb.h>
 
+#ifdef CONFIG_ARCH_ROCKCHIP
+#include <linux/rockchip/common.h>
+#endif
+
 #include "mm.h"
 
 static unsigned long phys_initrd_start __initdata = 0;
@@ -143,22 +147,6 @@ static void arm64_memory_present(void)
 }
 #endif
 
-#ifdef CONFIG_ARCH_ROCKCHIP
-extern struct ion_platform_data ion_pdata;
-extern void __init ion_reserve(struct ion_platform_data *data);
-extern int __init rockchip_ion_find_heap(unsigned long node,
-				const char *uname, int depth, void *data);
-
-void __init rockchip_ion_reserve_bit64(void)
-{
-#ifdef CONFIG_ION_ROCKCHIP
-	printk("%s\n", __func__);
-	of_scan_flat_dt(rockchip_ion_find_heap, (void*)&ion_pdata);
-	ion_reserve(&ion_pdata);
-#endif
-}
-#endif
-
 void __init arm64_memblock_init(void)
 {
 	u64 *reserve_map, base, size;
@@ -200,7 +188,11 @@ void __init arm64_memblock_init(void)
 
 	early_init_fdt_scan_reserved_mem();
 #ifdef CONFIG_ARCH_ROCKCHIP
-	rockchip_ion_reserve_bit64();
+	/* reserve memory for uboot */
+	rockchip_uboot_mem_reserve();
+
+	/* reserve memory for ION */
+	rockchip_ion_reserve();
 #endif
 
 	/* 4GB maximum for 32-bit only capable devices */