evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

metag: use early_init_dt_scan

Browse source 
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>
This commit is contained in:
Rob Herring 2013-09-25 15:46:14 -05:00
parent a8e44636c6
commit e5d659935e
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/metag/kernel/devtree.c
View file

@ -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 machine_desc * __init setup_machine_fdt(void *dt)
{ {
struct boot_param_header *devtree = dt;
struct machine_desc *mdesc, *mdesc_best = NULL; struct machine_desc *mdesc, *mdesc_best = NULL;
unsigned int score, mdesc_score = ~1; unsigned int score, mdesc_score = ~1;
unsigned long dt_root; unsigned long dt_root;
const char *model; const char *model;
/* check device tree validity */ /* check device tree validity */
if (be32_to_cpu(devtree->magic) != OF_DT_HEADER) if (!early_init_dt_scan(dt))
return NULL; return NULL;
/* Search the mdescs for the 'best' compatible value match */ /* Search the mdescs for the 'best' compatible value match */
initial_boot_params = devtree;
dt_root = of_get_flat_dt_root(); dt_root = of_get_flat_dt_root();
for_each_machine_desc(mdesc) { for_each_machine_desc(mdesc) {
@ -90,9 +88,6 @@ struct machine_desc * __init setup_machine_fdt(void *dt)
model = "<unknown>"; model = "<unknown>";
pr_info("Machine: %s, model: %s\n", mdesc_best->name, model); 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; return mdesc_best;
} }