summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-08-26 10:12:22 -0500
committerRob Herring <rob.herring@calxeda.com>2013-10-09 11:38:08 -0500
commitad81fcb53033be98ab29c6cfb6ef0249a8e2ffaa (patch)
tree80d9822cd3f3ab809bea26535c0a9d6243ede8de
parent0288ffcbfdf9b8656e7320c24caa1e4c1d498287 (diff)
downloadblackbird-op-linux-ad81fcb53033be98ab29c6cfb6ef0249a8e2ffaa.tar.gz
blackbird-op-linux-ad81fcb53033be98ab29c6cfb6ef0249a8e2ffaa.zip
arc: use early_init_dt_scan
Convert arc to use new early_init_dt_scan function. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--arch/arc/kernel/devtree.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index eeb613aa44ff..1ab6f3569f60 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -27,7 +27,6 @@
*/
struct machine_desc * __init setup_machine_fdt(void *dt)
{
- struct boot_param_header *devtree = dt;
struct machine_desc *mdesc = NULL, *mdesc_best = NULL;
unsigned int score, mdesc_score = ~1;
unsigned long dt_root;
@@ -36,11 +35,9 @@ struct machine_desc * __init setup_machine_fdt(void *dt)
char manufacturer[16];
unsigned long len;
- /* check device tree validity */
- if (be32_to_cpu(devtree->magic) != OF_DT_HEADER)
+ if (!early_init_dt_scan(dt))
return NULL;
- initial_boot_params = devtree;
dt_root = of_get_flat_dt_root();
/*
@@ -85,15 +82,6 @@ struct machine_desc * __init setup_machine_fdt(void *dt)
pr_info("Board \"%s\" from %s (Manufacturer)\n", model, manufacturer);
- /* Retrieve various information from the /chosen node */
- of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line);
-
- /* Initialize {size,address}-cells info */
- of_scan_flat_dt(early_init_dt_scan_root, NULL);
-
- /* Setup memory, calling early_init_dt_add_memory_arch */
- of_scan_flat_dt(early_init_dt_scan_memory, NULL);
-
clk = of_get_flat_dt_prop(dt_root, "clock-frequency", &len);
if (clk)
arc_set_core_freq(of_read_ulong(clk, len/4));
OpenPOWER on IntegriCloud