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: Rob Herring <rob.herring@calxeda.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 7feb0c9..a4ed2d3 100644 (file)
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -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))) {
                early_print("\n"
                        "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)
                        cpu_relax();
        }
 
-       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();
 }
 
 /*