diff options
| author | John Crispin <blogic@openwrt.org> | 2013-04-13 15:15:51 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-08 01:19:12 +0200 |
| commit | dd63b00804a5c842fb73b6afc52f928f0c209a07 (patch) | |
| tree | 5796ffd3350bae994462e481380090e6d5cd1572 /arch/mips/ralink | |
| parent | 51e396078412ef91f222b9834f09308746ac7049 (diff) | |
| download | linux-stable-dd63b00804a5c842fb73b6afc52f928f0c209a07.tar.gz linux-stable-dd63b00804a5c842fb73b6afc52f928f0c209a07.tar.bz2 linux-stable-dd63b00804a5c842fb73b6afc52f928f0c209a07.zip | |
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 <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5184/
Diffstat (limited to 'arch/mips/ralink')
| -rw-r--r-- | arch/mips/ralink/of.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c index 4165e70775be..fb1569580def 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -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) |