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()
  ...

1 files changed, 4 insertions, 56 deletions

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 47905598d790..0bc5e4cbc017 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -140,70 +140,18 @@ static void __init setup_processor(void)
 
 static void __init setup_machine_fdt(phys_addr_t dt_phys)
 {
-        struct boot_param_header *devtree;
-        unsigned long dt_root;
-
-        /* Check we have a non-NULL DT pointer */
-        if (!dt_phys) {
-                early_print("\n"
-                        "Error: NULL or invalid device tree blob\n"
-                        "The dtb must be 8-byte aligned and passed in the first 512MB of memory\n"
-                        "\nPlease check your bootloader.\n");
-
-                while (true)
-                        cpu_relax();
-
-        }
-
-        devtree = phys_to_virt(dt_phys);
-
-        /* Check device tree validity */
-        if (be32_to_cpu(devtree->magic) != OF_DT_HEADER) {
+        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"
-                        "Expected 0x%x, found 0x%x\n"
+                        "The dtb must be 8-byte aligned and passed in the first 512MB of memory\n"
                         "\nPlease check your bootloader.\n",
-                        dt_phys, devtree, OF_DT_HEADER,
-                        be32_to_cpu(devtree->magic));
+                        dt_phys, phys_to_virt(dt_phys));
 
                 while (true)
                         cpu_relax();
         }
 
-        initial_boot_params = devtree;
-        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);
-
-        /* 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);
-}
-
-void __init early_init_dt_add_memory_arch(u64 base, u64 size)
-{
-        base &= PAGE_MASK;
-        size &= PAGE_MASK;
-        if (base + size < PHYS_OFFSET) {
-                pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
-                           base, base + size);
-                return;
-        }
-        if (base < PHYS_OFFSET) {
-                pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
-                           base, PHYS_OFFSET);
-                size -= PHYS_OFFSET - base;
-                base = PHYS_OFFSET;
-        }
-        memblock_add(base, size);
+        machine_name = of_flat_dt_get_machine_name();
 }
 
 /*