From 550797902b0285736caceaf3c01506077d5440ea Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 13 Apr 2013 15:15:51 +0200 Subject: [PATCH 127/164] MIPS: ralink: make use of the new memory detection code Call detect_memory_region() from plat_mem_setup() unless the size was already read from the system controller. Signed-off-by: John Crispin Patchwork: http://patchwork.linux-mips.org/patch/5184/ --- arch/mips/ralink/of.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -85,6 +86,14 @@ void __init plat_mem_setup(void) * parsed resulting in our memory appearing */ __dt_setup_arch(&__dtb_start); + + if (soc_info.mem_size) + add_memory_region(soc_info.mem_base, soc_info.mem_size, + BOOT_MEM_RAM); + else + detect_memory_region(soc_info.mem_base, + soc_info.mem_size_min * SZ_1M, + soc_info.mem_size_max * SZ_1M); } static int __init plat_of_setup(void)