early_init_dt_scan() now takes care of falling back to the built-in DTB. On Netlogic XLP, use initial_boot_params in device_tree_init(), like the other MIPS sub-platforms do, as xlp_fdt_blob will now be NULL when using the default built-in DTB. Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx --- arch/mips/lantiq/prom.c | 2 +- arch/mips/mti-sead3/sead3-setup.c | 2 +- arch/mips/netlogic/xlp/dt.c | 8 +++----- arch/mips/ralink/of.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index 19686c5bc5ed..582f6e4a5f6d 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c @@ -71,7 +71,7 @@ void __init plat_mem_setup(void) * Load the builtin devicetree. This causes the chosen node to be * parsed resulting in our memory appearing */ - __dt_setup_arch(&__dtb_start); + __dt_setup_arch(NULL); } void __init device_tree_init(void) diff --git a/arch/mips/mti-sead3/sead3-setup.c b/arch/mips/mti-sead3/sead3-setup.c index 928ba84c8a78..3afec4507ea5 100644 --- a/arch/mips/mti-sead3/sead3-setup.c +++ b/arch/mips/mti-sead3/sead3-setup.c @@ -25,7 +25,7 @@ void __init plat_mem_setup(void) * Load the builtin devicetree. This causes the chosen node to be * parsed resulting in our memory appearing */ - __dt_setup_arch(&__dtb_start); + __dt_setup_arch(NULL); } void __init device_tree_init(void) diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c index 87250f378386..e52281b9214d 100644 --- a/arch/mips/netlogic/xlp/dt.c +++ b/arch/mips/netlogic/xlp/dt.c @@ -66,7 +66,6 @@ void __init *xlp_dt_init(void *fdtp) #endif default: /* Pick a built-in if any, and hope for the best */ - fdtp = &__dtb_start; break; } } @@ -83,13 +82,12 @@ void __init xlp_early_init_devtree(void) void __init device_tree_init(void) { unsigned long base, size; - struct boot_param_header *fdtp = xlp_fdt_blob; - if (!fdtp) + if (!initial_boot_params) return; - base = virt_to_phys(fdtp); - size = be32_to_cpu(fdtp->totalsize); + base = virt_to_phys(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); diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c index 615603bd8063..d72a5bc1efc2 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -84,7 +84,7 @@ void __init plat_mem_setup(void) * Load the builtin devicetree. This causes the chosen node to be * parsed resulting in our memory appearing */ - __dt_setup_arch(&__dtb_start); + __dt_setup_arch(NULL); if (soc_info.mem_size) add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M, -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html