arm: use common of_flat_dt_match_machine

Convert arm to use the common of_flat_dt_match_machine function.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index e7ce175..739c3df 100644 (file)
--- 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
@@ -184,9 +197,6 @@ bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
 const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 {
        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")
@@ -198,23 +208,17 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
        if (!dt_phys || !early_init_dt_scan(phys_to_virt(dt_phys)))
                return NULL;
 
+       mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach);
 
-       /* Search the mdescs for the 'best' compatible value match */
-       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);
@@ -226,15 +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);
-
        /* 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;
 }