diff options
| author | Rob Herring <robh@kernel.org> | 2014-04-02 17:50:19 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-04-30 00:55:57 -0500 |
| commit | 10fbdaab3f51359c5377495b1ab0698bb8e64df9 (patch) | |
| tree | 1afdc9e6d7af88495ead88f902ee7b034a5dff92 /arch/mips/lantiq | |
| parent | 8c97cec99033005cf1ede48a7b351e48a723749a (diff) | |
| download | linux-stable-10fbdaab3f51359c5377495b1ab0698bb8e64df9.tar.gz linux-stable-10fbdaab3f51359c5377495b1ab0698bb8e64df9.tar.bz2 linux-stable-10fbdaab3f51359c5377495b1ab0698bb8e64df9.zip | |
mips: lantiq: copy built-in DTB out of init section
The existing code is buggy because built-in DTBs are in init memory.
Fix this by using the 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>
Diffstat (limited to 'arch/mips/lantiq')
| -rw-r--r-- | arch/mips/lantiq/prom.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index 19686c5bc5ed..cdea687ad490 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c @@ -76,18 +76,7 @@ void __init plat_mem_setup(void) void __init device_tree_init(void) { - unsigned long base, size; - - 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); - - unflatten_device_tree(); + unflatten_and_copy_device_tree(); } void __init prom_init(void) |