diff options
Diffstat (limited to 'arch/mips/lantiq/prom.c')
-rw-r--r-- | arch/mips/lantiq/prom.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index 19686c5bc5ed..7447d322d14e 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c | |||
@@ -71,23 +71,12 @@ void __init plat_mem_setup(void) | |||
71 | * Load the builtin devicetree. This causes the chosen node to be | 71 | * Load the builtin devicetree. This causes the chosen node to be |
72 | * parsed resulting in our memory appearing | 72 | * parsed resulting in our memory appearing |
73 | */ | 73 | */ |
74 | __dt_setup_arch(&__dtb_start); | 74 | __dt_setup_arch(__dtb_start); |
75 | } | 75 | } |
76 | 76 | ||
77 | void __init device_tree_init(void) | 77 | void __init device_tree_init(void) |
78 | { | 78 | { |
79 | unsigned long base, size; | 79 | unflatten_and_copy_device_tree(); |
80 | |||
81 | if (!initial_boot_params) | ||
82 | return; | ||
83 | |||
84 | base = virt_to_phys((void *)initial_boot_params); | ||
85 | size = be32_to_cpu(initial_boot_params->totalsize); | ||
86 | |||
87 | /* Before we do anything, lets reserve the dt blob */ | ||
88 | reserve_bootmem(base, size, BOOTMEM_DEFAULT); | ||
89 | |||
90 | unflatten_device_tree(); | ||
91 | } | 80 | } |
92 | 81 | ||
93 | void __init prom_init(void) | 82 | void __init prom_init(void) |