diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-30 13:25:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-30 13:25:49 -0700 |
| commit | f139c74a8df071217dcd63f3ef06ae7be7071c4d (patch) | |
| tree | 5711f695577a18a06dbcd0101956e97b388ffa1a /arch/arm/kernel/devtree.c | |
| parent | bd695a5f0ccf7b38982c426d86055ff3591c9b5b (diff) | |
| parent | 26bcd8b72563b4c54892c4c2a409f6656fb8ae8b (diff) | |
| download | op-kernel-dev-f139c74a8df071217dcd63f3ef06ae7be7071c4d.zip op-kernel-dev-f139c74a8df071217dcd63f3ef06ae7be7071c4d.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/kernel/devtree.c')
| -rw-r--r-- | arch/arm/kernel/devtree.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index e94a157..11c54de 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -212,7 +212,7 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) mdesc_best = &__mach_desc_GENERIC_DT; #endif - if (!dt_phys || !early_init_dt_scan(phys_to_virt(dt_phys))) + if (!dt_phys || !early_init_dt_verify(phys_to_virt(dt_phys))) return NULL; mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach); @@ -237,6 +237,12 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) dump_machine_table(); /* does not return */ } + /* We really don't want to do this, but sometimes firmware provides buggy data */ + if (mdesc->dt_fixup) + mdesc->dt_fixup(); + + early_init_dt_scan_nodes(); + /* Change machine number to match the mdesc we're using */ __machine_arch_type = mdesc->nr; |
