mips: ralink: convert to use unflatten_and_copy_device_tree
authorRob Herring <robh@kernel.org>
Thu, 3 Apr 2014 00:07:24 +0000 (19:07 -0500)
committerRob Herring <robh@kernel.org>
Wed, 30 Apr 2014 05:56:00 +0000 (00:56 -0500)
The ralink FDT code can be simplified by using
unflatten_and_copy_device_tree function. This removes all accesses to
FDT header data by the arch code.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Tested-by: Grant Likely <grant.likely@linaro.org>
arch/mips/ralink/of.c

index eccc5526155e1b776acc87b35563d89ef72d5ea5..0170d829d073498a482c7c33e4189c37965d8fb6 100644 (file)
@@ -52,30 +52,7 @@ __iomem void *plat_of_remap_node(const char *node)
 
 void __init device_tree_init(void)
 {
-       unsigned long base, size;
-       void *fdt_copy;
-
-       if (!initial_boot_params)
-               return;
-
-       base = virt_to_phys((void *)initial_boot_params);
-       size = be32_to_cpu(initial_boot_params->totalsize);
-
-       /* Before we do anything, lets reserve the dt blob */
-       reserve_bootmem(base, size, BOOTMEM_DEFAULT);
-
-       /* The strings in the flattened tree are referenced directly by the
-        * device tree, so copy the flattened device tree from init memory
-        * to regular memory.
-        */
-       fdt_copy = alloc_bootmem(size);
-       memcpy(fdt_copy, initial_boot_params, size);
-       initial_boot_params = fdt_copy;
-
-       unflatten_device_tree();
-
-       /* free the space reserved for the dt blob */
-       free_bootmem(base, size);
+       unflatten_and_copy_device_tree();
 }
 
 void __init plat_mem_setup(void)