Commit dd63b008 authored by John Crispin's avatar John Crispin Committed by Ralf Baechle
Browse files

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: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5184/
parent 51e39607

arch/mips/ralink/of.c

+9 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/io.h>

#include <linux/clk.h>

#include <linux/init.h>

#include <linux/sizes.h>

#include <linux/of_fdt.h>

#include <linux/kernel.h>

#include <linux/bootmem.h>
@@ -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)