Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree updates from Rob Herring:
 "DeviceTree updates for 3.13.  This is a bit larger pull request than
  usual for this cycle with lots of clean-up.

   - Cross arch clean-up and consolidation of early DT scanning code.
   - Clean-up and removal of arch prom.h headers.  Makes arch specific
     prom.h optional on all but Sparc.
   - Addition of interrupts-extended property for devices connected to
     multiple interrupt controllers.
   - Refactoring of DT interrupt parsing code in preparation for
     deferred probe of interrupts.
   - ARM cpu and cpu topology bindings documentation.
   - Various DT vendor binding documentation updates"

* tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (82 commits)
  powerpc: add missing explicit OF includes for ppc
  dt/irq: add empty of_irq_count for !OF_IRQ
  dt: disable self-tests for !OF_IRQ
  of: irq: Fix interrupt-map entry matching
  MIPS: Netlogic: replace early_init_devtree() call
  of: Add Panasonic Corporation vendor prefix
  of: Add Chunghwa Picture Tubes Ltd. vendor prefix
  of: Add AU Optronics Corporation vendor prefix
  of/irq: Fix potential buffer overflow
  of/irq: Fix bug in interrupt parsing refactor.
  of: set dma_mask to point to coherent_dma_mask
  of: add vendor prefix for PHYTEC Messtechnik GmbH
  DT: sort vendor-prefixes.txt
  of: Add vendor prefix for Cadence
  of: Add empty for_each_available_child_of_node() macro definition
  arm/versatile: Fix versatile irq specifications.
  of/irq: create interrupts-extended property
  microblaze/pci: Drop PowerPC-ism from irq parsing
  of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
  of/irq: Use irq_of_parse_and_map()
  ...

5 files changed, 25 insertions, 116 deletions

diff --git a/arch/arc/include/asm/mach_desc.h b/arch/arc/include/asm/mach_desc.h
index 9998dc846ebb..e8993a2be6c2 100644
--- a/arch/arc/include/asm/mach_desc.h
+++ b/arch/arc/include/asm/mach_desc.h
@@ -51,22 +51,12 @@ struct machine_desc {
 /*
  * Current machine - only accessible during boot.
  */
-extern struct machine_desc *machine_desc;
+extern const struct machine_desc *machine_desc;
 
 /*
  * Machine type table - also only accessible during boot
  */
-extern struct machine_desc __arch_info_begin[], __arch_info_end[];
-#define for_each_machine_desc(p)                        \
-        for (p = __arch_info_begin; p < __arch_info_end; p++)
-
-static inline struct machine_desc *default_machine_desc(void)
-{
-        /* the default machine is the last one linked in */
-        if (__arch_info_end - 1 < __arch_info_begin)
-                return NULL;
-        return __arch_info_end - 1;
-}
+extern const struct machine_desc __arch_info_begin[], __arch_info_end[];
 
 /*
  * Set of macros to define architecture features.
@@ -81,7 +71,6 @@ __attribute__((__section__(".arch.info.init"))) = {	\
 #define MACHINE_END                             \
 };
 
-extern struct machine_desc *setup_machine_fdt(void *dt);
-extern void __init copy_devtree(void);
+extern const struct machine_desc *setup_machine_fdt(void *dt);
 
 #endif
diff --git a/arch/arc/include/asm/prom.h b/arch/arc/include/asm/prom.h
deleted file mode 100644
index 692d0d0789a7..000000000000
--- a/arch/arc/include/asm/prom.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _ASM_ARC_PROM_H_
-#define _ASM_ARC_PROM_H_
-
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
-#endif
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index 2340af0e1d6f..b6dc4e21fd32 100644
--- 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,93 +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 boot_param_header *devtree = 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;
 
-        /* check device tree validity */
-        if (be32_to_cpu(devtree->magic) != OF_DT_HEADER)
+        if (!early_init_dt_scan(dt))
                 return NULL;
 
-        initial_boot_params = devtree;
-        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);
-
-        /* 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);
 
+        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;
-}
-
-/*
- * Copy the flattened DT out of .init since unflattening doesn't copy strings
- * and the normal DT APIs refs them from orig flat DT
- */
-void __init copy_devtree(void)
-{
-        void *alloc = early_init_dt_alloc_memory_arch(
-                        be32_to_cpu(initial_boot_params->totalsize), 64);
-        if (alloc) {
-                memcpy(alloc, initial_boot_params,
-                                be32_to_cpu(initial_boot_params->totalsize));
-                initial_boot_params = alloc;
-        }
+        return mdesc;
 }
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index d9e15f16633e..643eae4436e0 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -21,7 +21,6 @@
 #include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/irq.h>
-#include <asm/prom.h>
 #include <asm/unwind.h>
 #include <asm/clk.h>
 #include <asm/mach_desc.h>
@@ -31,7 +30,7 @@
 int running_on_hw = 1;  /* vs. on ISS */
 
 char __initdata command_line[COMMAND_LINE_SIZE];
-struct machine_desc *machine_desc;
+const struct machine_desc *machine_desc;
 
 struct task_struct *_current_task[NR_CPUS];     /* For stack switching */
 
@@ -345,8 +344,7 @@ void __init setup_arch(char **cmdline_p)
         setup_arch_memory();
 
         /* copy flat DT out of .init and then unflatten it */
-        copy_devtree();
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 
         /* Can be issue if someone passes cmd line arg "ro"
          * But that is unlikely so keeping it as it is
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index 81279ec73a6a..55e0a85bea78 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -125,10 +125,3 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
         free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif
-
-#ifdef CONFIG_OF_FLATTREE
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        pr_err("%s(%llx, %llx)\n", __func__, start, end);
-}
-#endif /* CONFIG_OF_FLATTREE */