1 files changed, 19 insertions, 13 deletions

diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 7c4598cb6de8..0d30dcd63246 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -53,6 +53,17 @@ void __init device_tree_init(void)
         unflatten_and_copy_device_tree();
 }
 
+static int memory_dtb;
+
+static int __init early_init_dt_find_memory(unsigned long node,
+                                const char *uname, int depth, void *data)
+{
+        if (depth == 1 && !strcmp(uname, "memory@0"))
+                memory_dtb = 1;
+
+        return 0;
+}
+
 void __init plat_mem_setup(void)
 {
         set_io_port_base(KSEG1);
@@ -63,7 +74,12 @@ void __init plat_mem_setup(void)
          */
         __dt_setup_arch(__dtb_start);
 
-        if (soc_info.mem_size)
+        strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+
+        of_scan_flat_dt(early_init_dt_find_memory, NULL);
+        if (memory_dtb)
+                of_scan_flat_dt(early_init_dt_scan_memory, NULL);
+        else if (soc_info.mem_size)
                 add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M,
                                   BOOT_MEM_RAM);
         else
@@ -74,19 +90,9 @@ void __init plat_mem_setup(void)
 
 static int __init plat_of_setup(void)
 {
-        static struct of_device_id of_ids[3];
-        int len = sizeof(of_ids[0].compatible);
-
-        if (!of_have_populated_dt())
-                panic("device tree not present");
-
-        strlcpy(of_ids[0].compatible, soc_info.compatible, len);
-        strlcpy(of_ids[1].compatible, "palmbus", len);
-
-        if (of_platform_populate(NULL, of_ids, NULL, NULL))
-                panic("failed to populate DT");
+        __dt_register_buses(soc_info.compatible, "palmbus");
 
-        /* make sure ithat the reset controller is setup early */
+        /* make sure that the reset controller is setup early */
         ralink_rst_init();
 
         return 0;