diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-09-25 15:46:14 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 11:38:13 -0500 |
| commit | e5d659935e8aa4ee8d72b1cce9ad6d6f0213909e (patch) | |
| tree | 2e70a34ea3b9ac8c15edd4a9f9d35c004e41415f | |
| parent | a8e44636c66d90d177fcdf8e8cfc36747074a4ed (diff) | |
| download | linux-e5d659935e8aa4ee8d72b1cce9ad6d6f0213909e.tar.bz2 | |
metag: use early_init_dt_scan
Convert metag to use new early_init_dt_scan function.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: James Hogan <james.hogan@imgtec.com>
| -rw-r--r-- | arch/metag/kernel/devtree.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/metag/kernel/devtree.c b/arch/metag/kernel/devtree.c index 049af569cd49..68c2fee788c8 100644 --- a/arch/metag/kernel/devtree.c +++ b/arch/metag/kernel/devtree.c @@ -43,18 +43,16 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) */ struct machine_desc * __init setup_machine_fdt(void *dt) { - struct boot_param_header *devtree = dt; struct machine_desc *mdesc, *mdesc_best = NULL; unsigned int score, mdesc_score = ~1; unsigned long dt_root; const char *model; /* check device tree validity */ - if (be32_to_cpu(devtree->magic) != OF_DT_HEADER) + if (!early_init_dt_scan(dt)) return NULL; /* Search the mdescs for the 'best' compatible value match */ - initial_boot_params = devtree; dt_root = of_get_flat_dt_root(); for_each_machine_desc(mdesc) { @@ -90,9 +88,6 @@ struct machine_desc * __init setup_machine_fdt(void *dt) model = "<unknown>"; pr_info("Machine: %s, model: %s\n", mdesc_best->name, model); - /* Retrieve various information from the /chosen node */ - of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line); - return mdesc_best; } |