1 files changed, 20 insertions, 37 deletions

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index f35906b3d8c9..739c3dfc1da2 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -174,6 +174,19 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
         return (phys_id & MPIDR_HWID_BITMASK) == cpu_logical_map(cpu);
 }
 
+static const void * __init arch_get_next_mach(const char *const **match)
+{
+        static const struct machine_desc *mdesc = __arch_info_begin;
+        const struct machine_desc *m = mdesc;
+
+        if (m >= __arch_info_end)
+                return NULL;
+
+        mdesc++;
+        *match = m->dt_compat;
+        return m;
+}
+
 /**
  * setup_machine_fdt - Machine setup when an dtb was passed to the kernel
  * @dt_phys: physical address of dt blob
@@ -183,11 +196,7 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
  */
 const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 {
-        struct boot_param_header *devtree;
         const struct machine_desc *mdesc, *mdesc_best = NULL;
-        unsigned int score, mdesc_score = ~1;
-        unsigned long dt_root;
-        const char *model;
 
 #ifdef CONFIG_ARCH_MULTIPLATFORM
         DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
@@ -196,32 +205,20 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
         mdesc_best = &__mach_desc_GENERIC_DT;
 #endif
 
-        if (!dt_phys)
+        if (!dt_phys || !early_init_dt_scan(phys_to_virt(dt_phys)))
                 return NULL;
 
-        devtree = phys_to_virt(dt_phys);
+        mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach);
 
-        /* check device tree validity */
-        if (be32_to_cpu(devtree->magic) != OF_DT_HEADER)
-                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) {
-                score = of_flat_dt_match(dt_root, mdesc->dt_compat);
-                if (score > 0 && score < mdesc_score) {
-                        mdesc_best = mdesc;
-                        mdesc_score = score;
-                }
-        }
-        if (!mdesc_best) {
+        if (!mdesc) {
                 const char *prop;
                 long size;
+                unsigned long dt_root;
 
                 early_print("\nError: unrecognized/unsupported "
                             "device tree compatible list:\n[ ");
 
+                dt_root = of_get_flat_dt_root();
                 prop = of_get_flat_dt_prop(dt_root, "compatible", &size);
                 while (size > 0) {
                         early_print("'%s' ", prop);
@@ -233,22 +230,8 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
                 dump_machine_table(); /* does not return */
         }
 
-        model = of_get_flat_dt_prop(dt_root, "model", NULL);
-        if (!model)
-                model = of_get_flat_dt_prop(dt_root, "compatible", NULL);
-        if (!model)
-                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);
-        /* 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);
-
         /* Change machine number to match the mdesc we're using */
-        __machine_arch_type = mdesc_best->nr;
+        __machine_arch_type = mdesc->nr;
 
-        return mdesc_best;
+        return mdesc;
 }