Commit f2b99bcc authored by Rob Herring's avatar Rob Herring
Browse files

arm64: use common of_flat_dt_get_machine_name

Convert arm64 to use the common of_flat_dt_get_machine_name function.
Signed-off-by: default avatarRob Herring <>
Acked-by: default avatarCatalin Marinas <>
Cc: Will Deacon <>
parent 6d67a9f6
......@@ -124,8 +124,6 @@ static void __init setup_processor(void)
static void __init setup_machine_fdt(phys_addr_t dt_phys)
unsigned long dt_root;
if (!dt_phys || !early_init_dt_scan(phys_to_virt(dt_phys))) {
"Error: invalid device tree blob at physical address 0x%p (virtual address 0x%p)\n"
......@@ -137,14 +135,7 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
dt_root = of_get_flat_dt_root();
machine_name = of_get_flat_dt_prop(dt_root, "model", NULL);
if (!machine_name)
machine_name = of_get_flat_dt_prop(dt_root, "compatible", NULL);
if (!machine_name)
machine_name = "<unknown>";
pr_info("Machine: %s\n", machine_name);
machine_name = of_flat_dt_get_machine_name();
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment