Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / arch / arc / kernel / devtree.c

diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index 1ab6f3569f60c2c264b67a10f98159b993dd4b05..b6dc4e21fd32e209b0e76de102e7873b32b5927e 100644 (file)
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -14,10 +14,22 @@
 #include <linux/memblock.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
-#include <asm/prom.h>
 #include <asm/clk.h>
 #include <asm/mach_desc.h>
 
+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:                virtual address pointer to dt blob
@@ -25,66 +37,24 @@
  * If a dtb was passed to the kernel, then use it to choose the correct
  * machine_desc and to setup the system.
  */
-struct machine_desc * __init setup_machine_fdt(void *dt)
+const struct machine_desc * __init setup_machine_fdt(void *dt)
 {
-       struct machine_desc *mdesc = NULL, *mdesc_best = NULL;
-       unsigned int score, mdesc_score = ~1;
+       const struct machine_desc *mdesc;
        unsigned long dt_root;
-       const char *model, *compat;
        void *clk;
-       char manufacturer[16];
        unsigned long len;
 
        if (!early_init_dt_scan(dt))
                return NULL;
 
-       dt_root = of_get_flat_dt_root();
-
-       /*
-        * The kernel could be multi-platform enabled, thus could have many
-        * "baked-in" machine descriptors. Search thru all for the best
-        * "compatible" string match.
-        */
-       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) {
-               const char *prop;
-               long size;
-
-               pr_err("\n unrecognized device tree list:\n[ ");
-
-               prop = of_get_flat_dt_prop(dt_root, "compatible", &size);
-               if (prop) {
-                       while (size > 0) {
-                               printk("'%s' ", prop);
-                               size -= strlen(prop) + 1;
-                               prop += strlen(prop) + 1;
-                       }
-               }
-               printk("]\n\n");
-
+       mdesc = of_flat_dt_match_machine(NULL, arch_get_next_mach);
+       if (!mdesc)
                machine_halt();
-       }
-
-       /* compat = "<manufacturer>,<model>" */
-       compat =  mdesc_best->dt_compat[0];
-
-       model = strchr(compat, ',');
-       if (model)
-               model++;
-
-       strlcpy(manufacturer, compat, model ? model - compat : strlen(compat));
-
-       pr_info("Board \"%s\" from %s (Manufacturer)\n", model, manufacturer);
 
+       dt_root = of_get_flat_dt_root();
        clk = of_get_flat_dt_prop(dt_root, "clock-frequency", &len);
        if (clk)
                arc_set_core_freq(of_read_ulong(clk, len/4));
 
-       return mdesc_best;
+       return mdesc;
 }