From 541c12113eb8f62298b706961d33bc8fdd7e323e Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sat, 13 Apr 2013 15:15:51 +0200
Subject: [PATCH] --- yaml --- r: 375164 b: refs/heads/master c:
 dd63b00804a5c842fb73b6afc52f928f0c209a07 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/mips/ralink/of.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ba1e9e606e21..2b303212a632 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51e396078412ef91f222b9834f09308746ac7049
+refs/heads/master: dd63b00804a5c842fb73b6afc52f928f0c209a07
diff --git a/trunk/arch/mips/ralink/of.c b/trunk/arch/mips/ralink/of.c
index 4165e70775be..fb1569580def 100644
--- a/trunk/arch/mips/ralink/of.c
+++ b/trunk/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)