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

212 files changed, 1919 insertions, 1249 deletions

diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index f32494dbfe19..91304353eea4 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -1,77 +1,384 @@
-* ARM CPUs binding description
+=================
+ARM CPUs bindings
+=================
 
 The device tree allows to describe the layout of CPUs in a system through
 the "cpus" node, which in turn contains a number of subnodes (ie "cpu")
 defining properties for every cpu.
 
-Bindings for CPU nodes follow the ePAPR standard, available from:
-
-http://devicetree.org
-
-For the ARM architecture every CPU node must contain the following properties:
-
-- device_type:  must be "cpu"
-- reg:          property matching the CPU MPIDR[23:0] register bits
-                reg[31:24] bits must be set to 0
-- compatible:   should be one of:
-                "arm,arm1020"
-                "arm,arm1020e"
-                "arm,arm1022"
-                "arm,arm1026"
-                "arm,arm720"
-                "arm,arm740"
-                "arm,arm7tdmi"
-                "arm,arm920"
-                "arm,arm922"
-                "arm,arm925"
-                "arm,arm926"
-                "arm,arm940"
-                "arm,arm946"
-                "arm,arm9tdmi"
-                "arm,cortex-a5"
-                "arm,cortex-a7"
-                "arm,cortex-a8"
-                "arm,cortex-a9"
-                "arm,cortex-a15"
-                "arm,arm1136"
-                "arm,arm1156"
-                "arm,arm1176"
-                "arm,arm11mpcore"
-                "faraday,fa526"
-                "intel,sa110"
-                "intel,sa1100"
-                "marvell,feroceon"
-                "marvell,mohawk"
-                "marvell,xsc3"
-                "marvell,xscale"
-
-Example:
+Bindings for CPU nodes follow the ePAPR v1.1 standard, available from:
+
+https://www.power.org/documentation/epapr-version-1-1/
+
+with updates for 32-bit and 64-bit ARM systems provided in this document.
+
+================================
+Convention used in this document
+================================
+
+This document follows the conventions described in the ePAPR v1.1, with
+the addition:
+
+- square brackets define bitfields, eg reg[7:0] value of the bitfield in
+  the reg property contained in bits 7 down to 0
+
+=====================================
+cpus and cpu node bindings definition
+=====================================
+
+The ARM architecture, in accordance with the ePAPR, requires the cpus and cpu
+nodes to be present and contain the properties described below.
+
+- cpus node
+
+        Description: Container of cpu nodes
+
+        The node name must be "cpus".
+
+        A cpus node must define the following properties:
+
+        - #address-cells
+                Usage: required
+                Value type: <u32>
+
+                Definition depends on ARM architecture version and
+                configuration:
+
+                        # On uniprocessor ARM architectures previous to v7
+                          value must be 1, to enable a simple enumeration
+                          scheme for processors that do not have a HW CPU
+                          identification register.
+                        # On 32-bit ARM 11 MPcore, ARM v7 or later systems
+                          value must be 1, that corresponds to CPUID/MPIDR
+                          registers sizes.
+                        # On ARM v8 64-bit systems value should be set to 2,
+                          that corresponds to the MPIDR_EL1 register size.
+                          If MPIDR_EL1[63:32] value is equal to 0 on all CPUs
+                          in the system, #address-cells can be set to 1, since
+                          MPIDR_EL1[63:32] bits are not used for CPUs
+                          identification.
+        - #size-cells
+                Usage: required
+                Value type: <u32>
+                Definition: must be set to 0
+
+- cpu node
+
+        Description: Describes a CPU in an ARM based system
+
+        PROPERTIES
+
+        - device_type
+                Usage: required
+                Value type: <string>
+                Definition: must be "cpu"
+        - reg
+                Usage and definition depend on ARM architecture version and
+                configuration:
+
+                        # On uniprocessor ARM architectures previous to v7
+                          this property is required and must be set to 0.
+
+                        # On ARM 11 MPcore based systems this property is
+                          required and matches the CPUID[11:0] register bits.
+
+                          Bits [11:0] in the reg cell must be set to
+                          bits [11:0] in CPU ID register.
+
+                          All other bits in the reg cell must be set to 0.
+
+                        # On 32-bit ARM v7 or later systems this property is
+                          required and matches the CPU MPIDR[23:0] register
+                          bits.
+
+                          Bits [23:0] in the reg cell must be set to
+                          bits [23:0] in MPIDR.
+
+                          All other bits in the reg cell must be set to 0.
+
+                        # On ARM v8 64-bit systems this property is required
+                          and matches the MPIDR_EL1 register affinity bits.
+
+                          * If cpus node's #address-cells property is set to 2
+
+                            The first reg cell bits [7:0] must be set to
+                            bits [39:32] of MPIDR_EL1.
+
+                            The second reg cell bits [23:0] must be set to
+                            bits [23:0] of MPIDR_EL1.
+
+                          * If cpus node's #address-cells property is set to 1
+
+                            The reg cell bits [23:0] must be set to bits [23:0]
+                            of MPIDR_EL1.
+
+                          All other bits in the reg cells must be set to 0.
+
+        - compatible:
+                Usage: required
+                Value type: <string>
+                Definition: should be one of:
+                            "arm,arm710t"
+                            "arm,arm720t"
+                            "arm,arm740t"
+                            "arm,arm7ej-s"
+                            "arm,arm7tdmi"
+                            "arm,arm7tdmi-s"
+                            "arm,arm9es"
+                            "arm,arm9ej-s"
+                            "arm,arm920t"
+                            "arm,arm922t"
+                            "arm,arm925"
+                            "arm,arm926e-s"
+                            "arm,arm926ej-s"
+                            "arm,arm940t"
+                            "arm,arm946e-s"
+                            "arm,arm966e-s"
+                            "arm,arm968e-s"
+                            "arm,arm9tdmi"
+                            "arm,arm1020e"
+                            "arm,arm1020t"
+                            "arm,arm1022e"
+                            "arm,arm1026ej-s"
+                            "arm,arm1136j-s"
+                            "arm,arm1136jf-s"
+                            "arm,arm1156t2-s"
+                            "arm,arm1156t2f-s"
+                            "arm,arm1176jzf"
+                            "arm,arm1176jz-s"
+                            "arm,arm1176jzf-s"
+                            "arm,arm11mpcore"
+                            "arm,cortex-a5"
+                            "arm,cortex-a7"
+                            "arm,cortex-a8"
+                            "arm,cortex-a9"
+                            "arm,cortex-a15"
+                            "arm,cortex-a53"
+                            "arm,cortex-a57"
+                            "arm,cortex-m0"
+                            "arm,cortex-m0+"
+                            "arm,cortex-m1"
+                            "arm,cortex-m3"
+                            "arm,cortex-m4"
+                            "arm,cortex-r4"
+                            "arm,cortex-r5"
+                            "arm,cortex-r7"
+                            "faraday,fa526"
+                            "intel,sa110"
+                            "intel,sa1100"
+                            "marvell,feroceon"
+                            "marvell,mohawk"
+                            "marvell,pj4a"
+                            "marvell,pj4b"
+                            "marvell,sheeva-v5"
+                            "qcom,krait"
+                            "qcom,scorpion"
+        - enable-method
+                Value type: <stringlist>
+                Usage and definition depend on ARM architecture version.
+                        # On ARM v8 64-bit this property is required and must
+                          be one of:
+                             "spin-table"
+                             "psci"
+                        # On ARM 32-bit systems this property is optional.
+
+        - cpu-release-addr
+                Usage: required for systems that have an "enable-method"
+                       property value of "spin-table".
+                Value type: <prop-encoded-array>
+                Definition:
+                        # On ARM v8 64-bit systems must be a two cell
+                          property identifying a 64-bit zero-initialised
+                          memory location.
+
+Example 1 (dual-cluster big.LITTLE system 32-bit):
 
         cpus {
                 #size-cells = <0>;
                 #address-cells = <1>;
 
-                CPU0: cpu@0 {
+                cpu@0 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0x0>;
                 };
 
-                CPU1: cpu@1 {
+                cpu@1 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0x1>;
                 };
 
-                CPU2: cpu@100 {
+                cpu@100 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x100>;
                 };
 
-                CPU3: cpu@101 {
+                cpu@101 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x101>;
                 };
         };
+
+Example 2 (Cortex-A8 uniprocessor 32-bit system):
+
+        cpus {
+                #size-cells = <0>;
+                #address-cells = <1>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a8";
+                        reg = <0x0>;
+                };
+        };
+
+Example 3 (ARM 926EJ-S uniprocessor 32-bit system):
+
+        cpus {
+                #size-cells = <0>;
+                #address-cells = <1>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,arm926ej-s";
+                        reg = <0x0>;
+                };
+        };
+
+Example 4 (ARM Cortex-A57 64-bit system):
+
+cpus {
+        #size-cells = <0>;
+        #address-cells = <2>;
+
+        cpu@0 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x0>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@1 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x1>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@10000 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10000>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@10001 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10001>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@10100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@10101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100000000 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x0>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100000001 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x1>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100000100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100000101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100010000 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10000>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100010001 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10001>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100010100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        cpu@100010101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/arm/topology.txt b/Documentation/devicetree/bindings/arm/topology.txt
new file mode 100644
index 000000000000..4aa20e7a424e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/topology.txt
@@ -0,0 +1,474 @@
+===========================================
+ARM topology binding description
+===========================================
+
+===========================================
+1 - Introduction
+===========================================
+
+In an ARM system, the hierarchy of CPUs is defined through three entities that
+are used to describe the layout of physical CPUs in the system:
+
+- cluster
+- core
+- thread
+
+The cpu nodes (bindings defined in [1]) represent the devices that
+correspond to physical CPUs and are to be mapped to the hierarchy levels.
+
+The bottom hierarchy level sits at core or thread level depending on whether
+symmetric multi-threading (SMT) is supported or not.
+
+For instance in a system where CPUs support SMT, "cpu" nodes represent all
+threads existing in the system and map to the hierarchy level "thread" above.
+In systems where SMT is not supported "cpu" nodes represent all cores present
+in the system and map to the hierarchy level "core" above.
+
+ARM topology bindings allow one to associate cpu nodes with hierarchical groups
+corresponding to the system hierarchy; syntactically they are defined as device
+tree nodes.
+
+The remainder of this document provides the topology bindings for ARM, based
+on the ePAPR standard, available from:
+
+http://www.power.org/documentation/epapr-version-1-1/
+
+If not stated otherwise, whenever a reference to a cpu node phandle is made its
+value must point to a cpu node compliant with the cpu node bindings as
+documented in [1].
+A topology description containing phandles to cpu nodes that are not compliant
+with bindings standardized in [1] is therefore considered invalid.
+
+===========================================
+2 - cpu-map node
+===========================================
+
+The ARM CPU topology is defined within the cpu-map node, which is a direct
+child of the cpus node and provides a container where the actual topology
+nodes are listed.
+
+- cpu-map node
+
+        Usage: Optional - On ARM SMP systems provide CPUs topology to the OS.
+                          ARM uniprocessor systems do not require a topology
+                          description and therefore should not define a
+                          cpu-map node.
+
+        Description: The cpu-map node is just a container node where its
+                     subnodes describe the CPU topology.
+
+        Node name must be "cpu-map".
+
+        The cpu-map node's parent node must be the cpus node.
+
+        The cpu-map node's child nodes can be:
+
+        - one or more cluster nodes
+
+        Any other configuration is considered invalid.
+
+The cpu-map node can only contain three types of child nodes:
+
+- cluster node
+- core node
+- thread node
+
+whose bindings are described in paragraph 3.
+
+The nodes describing the CPU topology (cluster/core/thread) can only be
+defined within the cpu-map node.
+Any other configuration is consider invalid and therefore must be ignored.
+
+===========================================
+2.1 - cpu-map child nodes naming convention
+===========================================
+
+cpu-map child nodes must follow a naming convention where the node name
+must be "clusterN", "coreN", "threadN" depending on the node type (ie
+cluster/core/thread) (where N = {0, 1, ...} is the node number; nodes which
+are siblings within a single common parent node must be given a unique and
+sequential N value, starting from 0).
+cpu-map child nodes which do not share a common parent node can have the same
+name (ie same number N as other cpu-map child nodes at different device tree
+levels) since name uniqueness will be guaranteed by the device tree hierarchy.
+
+===========================================
+3 - cluster/core/thread node bindings
+===========================================
+
+Bindings for cluster/cpu/thread nodes are defined as follows:
+
+- cluster node
+
+         Description: must be declared within a cpu-map node, one node
+                      per cluster. A system can contain several layers of
+                      clustering and cluster nodes can be contained in parent
+                      cluster nodes.
+
+        The cluster node name must be "clusterN" as described in 2.1 above.
+        A cluster node can not be a leaf node.
+
+        A cluster node's child nodes must be:
+
+        - one or more cluster nodes; or
+        - one or more core nodes
+
+        Any other configuration is considered invalid.
+
+- core node
+
+        Description: must be declared in a cluster node, one node per core in
+                     the cluster. If the system does not support SMT, core
+                     nodes are leaf nodes, otherwise they become containers of
+                     thread nodes.
+
+        The core node name must be "coreN" as described in 2.1 above.
+
+        A core node must be a leaf node if SMT is not supported.
+
+        Properties for core nodes that are leaf nodes:
+
+        - cpu
+                Usage: required
+                Value type: <phandle>
+                Definition: a phandle to the cpu node that corresponds to the
+                            core node.
+
+        If a core node is not a leaf node (CPUs supporting SMT) a core node's
+        child nodes can be:
+
+        - one or more thread nodes
+
+        Any other configuration is considered invalid.
+
+- thread node
+
+        Description: must be declared in a core node, one node per thread
+                     in the core if the system supports SMT. Thread nodes are
+                     always leaf nodes in the device tree.
+
+        The thread node name must be "threadN" as described in 2.1 above.
+
+        A thread node must be a leaf node.
+
+        A thread node must contain the following property:
+
+        - cpu
+                Usage: required
+                Value type: <phandle>
+                Definition: a phandle to the cpu node that corresponds to
+                            the thread node.
+
+===========================================
+4 - Example dts
+===========================================
+
+Example 1 (ARM 64-bit, 16-cpu system, two clusters of clusters):
+
+cpus {
+        #size-cells = <0>;
+        #address-cells = <2>;
+
+        cpu-map {
+                cluster0 {
+                        cluster0 {
+                                core0 {
+                                        thread0 {
+                                                cpu = <&CPU0>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU1>;
+                                        };
+                                };
+
+                                core1 {
+                                        thread0 {
+                                                cpu = <&CPU2>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU3>;
+                                        };
+                                };
+                        };
+
+                        cluster1 {
+                                core0 {
+                                        thread0 {
+                                                cpu = <&CPU4>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU5>;
+                                        };
+                                };
+
+                                core1 {
+                                        thread0 {
+                                                cpu = <&CPU6>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU7>;
+                                        };
+                                };
+                        };
+                };
+
+                cluster1 {
+                        cluster0 {
+                                core0 {
+                                        thread0 {
+                                                cpu = <&CPU8>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU9>;
+                                        };
+                                };
+                                core1 {
+                                        thread0 {
+                                                cpu = <&CPU10>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU11>;
+                                        };
+                                };
+                        };
+
+                        cluster1 {
+                                core0 {
+                                        thread0 {
+                                                cpu = <&CPU12>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU13>;
+                                        };
+                                };
+                                core1 {
+                                        thread0 {
+                                                cpu = <&CPU14>;
+                                        };
+                                        thread1 {
+                                                cpu = <&CPU15>;
+                                        };
+                                };
+                        };
+                };
+        };
+
+        CPU0: cpu@0 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x0>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU1: cpu@1 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x1>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU2: cpu@100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU3: cpu@101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU4: cpu@10000 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10000>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU5: cpu@10001 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10001>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU6: cpu@10100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU7: cpu@10101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x0 0x10101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU8: cpu@100000000 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x0>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU9: cpu@100000001 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x1>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU10: cpu@100000100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU11: cpu@100000101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU12: cpu@100010000 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10000>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU13: cpu@100010001 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10001>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU14: cpu@100010100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10100>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+
+        CPU15: cpu@100010101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a57";
+                reg = <0x1 0x10101>;
+                enable-method = "spin-table";
+                cpu-release-addr = <0 0x20000000>;
+        };
+};
+
+Example 2 (ARM 32-bit, dual-cluster, 8-cpu system, no SMT):
+
+cpus {
+        #size-cells = <0>;
+        #address-cells = <1>;
+
+        cpu-map {
+                cluster0 {
+                        core0 {
+                                cpu = <&CPU0>;
+                        };
+                        core1 {
+                                cpu = <&CPU1>;
+                        };
+                        core2 {
+                                cpu = <&CPU2>;
+                        };
+                        core3 {
+                                cpu = <&CPU3>;
+                        };
+                };
+
+                cluster1 {
+                        core0 {
+                                cpu = <&CPU4>;
+                        };
+                        core1 {
+                                cpu = <&CPU5>;
+                        };
+                        core2 {
+                                cpu = <&CPU6>;
+                        };
+                        core3 {
+                                cpu = <&CPU7>;
+                        };
+                };
+        };
+
+        CPU0: cpu@0 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a15";
+                reg = <0x0>;
+        };
+
+        CPU1: cpu@1 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a15";
+                reg = <0x1>;
+        };
+
+        CPU2: cpu@2 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a15";
+                reg = <0x2>;
+        };
+
+        CPU3: cpu@3 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a15";
+                reg = <0x3>;
+        };
+
+        CPU4: cpu@100 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a7";
+                reg = <0x100>;
+        };
+
+        CPU5: cpu@101 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a7";
+                reg = <0x101>;
+        };
+
+        CPU6: cpu@102 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a7";
+                reg = <0x102>;
+        };
+
+        CPU7: cpu@103 {
+                device_type = "cpu";
+                compatible = "arm,cortex-a7";
+                reg = <0x103>;
+        };
+};
+
+===============================================================================
+[1] ARM Linux kernel documentation
+    Documentation/devicetree/bindings/arm/cpus.txt
diff --git a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
index 72a06c0ab1db..1486497a24c1 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
@@ -4,16 +4,33 @@ Specifying interrupt information for devices
 1) Interrupt client nodes
 -------------------------
 
-Nodes that describe devices which generate interrupts must contain an
-"interrupts" property. This property must contain a list of interrupt
-specifiers, one per output interrupt. The format of the interrupt specifier is
-determined by the interrupt controller to which the interrupts are routed; see
-section 2 below for details.
+Nodes that describe devices which generate interrupts must contain an either an
+"interrupts" property or an "interrupts-extended" property. These properties
+contain a list of interrupt specifiers, one per output interrupt. The format of
+the interrupt specifier is determined by the interrupt controller to which the
+interrupts are routed; see section 2 below for details.
+
+  Example:
+        interrupt-parent = <&intc1>;
+        interrupts = <5 0>, <6 0>;
 
 The "interrupt-parent" property is used to specify the controller to which
 interrupts are routed and contains a single phandle referring to the interrupt
 controller node. This property is inherited, so it may be specified in an
-interrupt client node or in any of its parent nodes.
+interrupt client node or in any of its parent nodes. Interrupts listed in the
+"interrupts" property are always in reference to the node's interrupt parent.
+
+The "interrupts-extended" property is a special form for use when a node needs
+to reference multiple interrupt parents. Each entry in this property contains
+both the parent phandle and the interrupt specifier. "interrupts-extended"
+should only be used when a device has multiple interrupt parents.
+
+  Example:
+        interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;
+
+A device node may contain either "interrupts" or "interrupts-extended", but not
+both. If both properties are present, then the operating system should log an
+error and use only the data in "interrupts".
 
 2) Interrupt controller nodes
 -----------------------------
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 04eab45dd148..ce95ed1c6d3e 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -12,12 +12,15 @@ amcc	Applied Micro Circuits Corporation (APM, formally AMCC)
 apm     Applied Micro Circuits Corporation (APM)
 arm     ARM Ltd.
 atmel   Atmel Corporation
+auo     AU Optronics Corporation
 avago   Avago Technologies
 bosch   Bosch Sensortec GmbH
 brcm    Broadcom Corporation
 capella Capella Microsystems, Inc
 cavium  Cavium, Inc.
+cdns    Cadence Design Systems Inc.
 chrp    Common Hardware Reference Platform
+chunghwa        Chunghwa Picture Tubes Ltd.
 cirrus  Cirrus Logic, Inc.
 cortina Cortina Systems, Inc.
 dallas  Maxim Integrated Products (formerly Dallas Semiconductor)
@@ -46,6 +49,8 @@ nintendo	Nintendo
 nvidia  NVIDIA
 nxp     NXP Semiconductors
 onnn    ON Semiconductor Corp.
+panasonic       Panasonic Corporation
+phytec  PHYTEC Messtechnik GmbH
 picochip        Picochip Ltd
 powervr PowerVR (deprecated, use img)
 qca     Qualcomm Atheros, Inc.
@@ -65,12 +70,12 @@ snps 	Synopsys, Inc.
 st      STMicroelectronics
 ste     ST-Ericsson
 stericsson      ST-Ericsson
-toumaz  Toumaz
 ti      Texas Instruments
 toshiba Toshiba Corporation
+toumaz  Toumaz
 v3      V3 Semiconductor
 via     VIA Technologies, Inc.
+winbond Winbond Electronics corp.
 wlf     Wolfson Microelectronics
 wm      Wondermedia Technologies, Inc.
-winbond Winbond Electronics corp.
 xlnx    Xilinx
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 */
diff --git a/arch/arm/boot/dts/testcases/tests-interrupts.dtsi b/arch/arm/boot/dts/testcases/tests-interrupts.dtsi
new file mode 100644
index 000000000000..c843720bd3e5
--- /dev/null
+++ b/arch/arm/boot/dts/testcases/tests-interrupts.dtsi
@@ -0,0 +1,58 @@
+
+/ {
+        testcase-data {
+                interrupts {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        test_intc0: intc0 {
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+
+                        test_intc1: intc1 {
+                                interrupt-controller;
+                                #interrupt-cells = <3>;
+                        };
+
+                        test_intc2: intc2 {
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        test_intmap0: intmap0 {
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                interrupt-map = <1 &test_intc0 9>,
+                                                <2 &test_intc1 10 11 12>,
+                                                <3 &test_intc2 13 14>,
+                                                <4 &test_intc2 15 16>;
+                        };
+
+                        test_intmap1: intmap1 {
+                                #interrupt-cells = <2>;
+                                interrupt-map = <0x5000 1 2 &test_intc0 15>;
+                        };
+
+                        interrupts0 {
+                                interrupt-parent = <&test_intc0>;
+                                interrupts = <1>, <2>, <3>, <4>;
+                        };
+
+                        interrupts1 {
+                                interrupt-parent = <&test_intmap0>;
+                                interrupts = <1>, <2>, <3>, <4>;
+                        };
+
+                        interrupts-extended0 {
+                                reg = <0x5000 0x100>;
+                                interrupts-extended = <&test_intc0 1>,
+                                                      <&test_intc1 2 3 4>,
+                                                      <&test_intc2 5 6>,
+                                                      <&test_intmap0 1>,
+                                                      <&test_intmap0 2>,
+                                                      <&test_intmap0 3>,
+                                                      <&test_intmap1 1 2>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/testcases/tests.dtsi b/arch/arm/boot/dts/testcases/tests.dtsi
index a7c5067622e8..3f123ecc9dd7 100644
--- a/arch/arm/boot/dts/testcases/tests.dtsi
+++ b/arch/arm/boot/dts/testcases/tests.dtsi
@@ -1 +1,2 @@
 /include/ "tests-phandle.dtsi"
+/include/ "tests-interrupts.dtsi"
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index dde75ae8b4b1..e01e5a081def 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -185,7 +185,7 @@
                         mmc@5000 {
                                 compatible = "arm,primecell";
                                 reg = < 0x5000 0x1000>;
-                                interrupts = <22 34>;
+                                interrupts-extended = <&vic 22 &sic 2>;
                         };
                         kmi@6000 {
                                 compatible = "arm,pl050", "arm,primecell";
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index 7e8175269064..f43907c40c93 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -41,7 +41,7 @@
                         mmc@b000 {
                                 compatible = "arm,primecell";
                                 reg = <0xb000 0x1000>;
-                                interrupts = <23 34>;
+                                interrupts-extended = <&vic 23 &sic 2>;
                         };
                 };
         };
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
index 4a2985e21969..b681575ad3de 100644
--- a/arch/arm/include/asm/prom.h
+++ b/arch/arm/include/asm/prom.h
@@ -11,8 +11,6 @@
 #ifndef __ASMARM_PROM_H
 #define __ASMARM_PROM_H
 
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
 #ifdef CONFIG_OF
 
 extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
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;
 }
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c
index c9c5a33bc802..c5e01b24d9fb 100644
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -808,22 +808,6 @@ static u8 __init pci_v3_swizzle(struct pci_dev *dev, u8 *pinp)
         return pci_common_swizzle(dev, pinp);
 }
 
-static int __init pci_v3_map_irq_dt(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        struct of_irq oirq;
-        int ret;
-
-        ret = of_irq_map_pci(dev, &oirq);
-        if (ret) {
-                dev_err(&dev->dev, "of_irq_map_pci() %d\n", ret);
-                /* Proper return code 0 == NO_IRQ */
-                return 0;
-        }
-
-        return irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                     oirq.size);
-}
-
 static struct hw_pci pci_v3 __initdata = {
         .swizzle                = pci_v3_swizzle,
         .setup                  = pci_v3_setup,
@@ -914,7 +898,7 @@ static int __init pci_v3_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        pci_v3.map_irq = pci_v3_map_irq_dt;
+        pci_v3.map_irq = of_irq_parse_and_map_pci;
         pci_common_init_dev(&pdev->dev, &pci_v3);
 
         return 0;
diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c
index c12296157d4a..5cf0683577ea 100644
--- a/arch/arm/mach-keystone/platsmp.c
+++ b/arch/arm/mach-keystone/platsmp.c
@@ -17,7 +17,6 @@
 #include <linux/io.h>
 
 #include <asm/smp_plat.h>
-#include <asm/prom.h>
 
 #include "keystone.h"
 
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index b5db207dfd1e..9a5f9fb352ce 100644
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -358,8 +358,7 @@ static struct delay_timer u300_delay_timer;
  */
 static void __init u300_timer_init_of(struct device_node *np)
 {
-        struct resource irq_res;
-        int irq;
+        unsigned int irq;
         struct clk *clk;
         unsigned long rate;
 
@@ -368,11 +367,11 @@ static void __init u300_timer_init_of(struct device_node *np)
                 panic("could not ioremap system timer\n");
 
         /* Get the IRQ for the GP1 timer */
-        irq = of_irq_to_resource(np, 2, &irq_res);
-        if (irq <= 0)
+        irq = irq_of_parse_and_map(np, 2);
+        if (!irq)
                 panic("no IRQ for system timer\n");
 
-        pr_info("U300 GP1 timer @ base: %p, IRQ: %d\n", u300_timer_base, irq);
+        pr_info("U300 GP1 timer @ base: %p, IRQ: %u\n", u300_timer_base, irq);
 
         /* Clock the interrupt controller */
         clk = of_clk_get(np, 0);
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 18ec4c504abf..ca907f805c57 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -76,14 +76,6 @@ static int __init parse_tag_initrd2(const struct tag *tag)
 
 __tagtable(ATAG_INITRD2, parse_tag_initrd2);
 
-#ifdef CONFIG_OF_FLATTREE
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        phys_initrd_start = start;
-        phys_initrd_size = end - start;
-}
-#endif /* CONFIG_OF_FLATTREE */
-
 /*
  * This keeps memory configuration data used by a couple memory
  * initialization functions, as well as show_mem() for the skipping
@@ -350,6 +342,11 @@ void __init arm_memblock_init(struct meminfo *mi,
         memblock_reserve(__pa(_stext), _end - _stext);
 #endif
 #ifdef CONFIG_BLK_DEV_INITRD
+        /* FDT scan will populate initrd_start */
+        if (initrd_start) {
+                phys_initrd_start = __virt_to_phys(initrd_start);
+                phys_initrd_size = initrd_end - initrd_start;
+        }
         if (phys_initrd_size &&
             !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {
                 pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",
diff --git a/arch/arm64/include/asm/prom.h b/arch/arm64/include/asm/prom.h
deleted file mode 100644
index 68b90e682957..000000000000
--- a/arch/arm64/include/asm/prom.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty for now */
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();
 }
 
 /*
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index de2de5db628d..0cb8742de4f2 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -31,7 +31,6 @@
 #include <linux/sort.h>
 #include <linux/of_fdt.h>
 
-#include <asm/prom.h>
 #include <asm/sections.h>
 #include <asm/setup.h>
 #include <asm/sizes.h>
@@ -39,17 +38,9 @@
 
 #include "mm.h"
 
-static unsigned long phys_initrd_start __initdata = 0;
-static unsigned long phys_initrd_size __initdata = 0;
-
 phys_addr_t memstart_addr __read_mostly = 0;
 
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        phys_initrd_start = start;
-        phys_initrd_size = end - start;
-}
-
+#ifdef CONFIG_BLK_DEV_INITRD
 static int __init early_initrd(char *p)
 {
         unsigned long start, size;
@@ -59,12 +50,13 @@ static int __init early_initrd(char *p)
         if (*endp == ',') {
                 size = memparse(endp + 1, NULL);
 
-                phys_initrd_start = start;
-                phys_initrd_size = size;
+                initrd_start = (unsigned long)__va(start);
+                initrd_end = (unsigned long)__va(start + size);
         }
         return 0;
 }
 early_param("initrd", early_initrd);
+#endif
 
 #define MAX_DMA32_PFN ((4UL * 1024 * 1024 * 1024) >> PAGE_SHIFT)
 
@@ -137,13 +129,8 @@ void __init arm64_memblock_init(void)
         /* Register the kernel text, kernel data and initrd with memblock */
         memblock_reserve(__pa(_text), _end - _text);
 #ifdef CONFIG_BLK_DEV_INITRD
-        if (phys_initrd_size) {
-                memblock_reserve(phys_initrd_start, phys_initrd_size);
-
-                /* Now convert initrd to virtual addresses */
-                initrd_start = __phys_to_virt(phys_initrd_start);
-                initrd_end = initrd_start + phys_initrd_size;
-        }
+        if (initrd_start)
+                memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start);
 #endif
 
         /*
diff --git a/arch/c6x/include/asm/prom.h b/arch/c6x/include/asm/prom.h
deleted file mode 100644
index b4ec95f07518..000000000000
--- a/arch/c6x/include/asm/prom.h
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy prom.h; here to make linux/of.h's #includes happy */
diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/asm/setup.h
index ecead15872a6..696804475f55 100644
--- a/arch/c6x/include/asm/setup.h
+++ b/arch/c6x/include/asm/setup.h
@@ -14,8 +14,6 @@
 #include <uapi/asm/setup.h>
 
 #ifndef __ASSEMBLY__
-extern char c6x_command_line[COMMAND_LINE_SIZE];
-
 extern int c6x_add_memory(phys_addr_t start, unsigned long size);
 
 extern unsigned long ram_start;
diff --git a/arch/c6x/kernel/devicetree.c b/arch/c6x/kernel/devicetree.c
index 9e15ab9199b2..fa3e5741514e 100644
--- a/arch/c6x/kernel/devicetree.c
+++ b/arch/c6x/kernel/devicetree.c
@@ -10,37 +10,8 @@
  *
  */
 #include <linux/init.h>
-#include <linux/of.h>
-#include <linux/of_fdt.h>
-#include <linux/initrd.h>
 #include <linux/memblock.h>
 
-void __init early_init_devtree(void *params)
-{
-        /* Setup flat device-tree pointer */
-        initial_boot_params = params;
-
-        /* Retrieve various informations from the /chosen node of the
-         * device-tree, including the platform type, initrd location and
-         * size and more ...
-         */
-        of_scan_flat_dt(early_init_dt_scan_chosen, c6x_command_line);
-
-        /* Scan memory nodes and rebuild MEMBLOCKs */
-        of_scan_flat_dt(early_init_dt_scan_root, NULL);
-        of_scan_flat_dt(early_init_dt_scan_memory, NULL);
-}
-
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (unsigned long)__va(start);
-        initrd_end = (unsigned long)__va(end);
-        initrd_below_start_ok = 1;
-}
-#endif
-
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
         c6x_add_memory(base, size);
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index f4e72bd8c103..731db4b9014d 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -68,13 +68,6 @@ unsigned long ram_end;
 static unsigned long dma_start __initdata;
 static unsigned long dma_size __initdata;
 
-char c6x_command_line[COMMAND_LINE_SIZE];
-
-#if defined(CONFIG_CMDLINE_BOOL)
-static const char default_command_line[COMMAND_LINE_SIZE] __section(.cmdline) =
-        CONFIG_CMDLINE;
-#endif
-
 struct cpuinfo_c6x {
         const char *cpu_name;
         const char *cpu_voltage;
@@ -294,10 +287,8 @@ notrace void __init machine_init(unsigned long dt_ptr)
                 fdt = dtb;
 
         /* Do some early initialization based on the flat device tree */
-        early_init_devtree(fdt);
+        early_init_dt_scan(fdt);
 
-        /* parse_early_param needs a boot_command_line */
-        strlcpy(boot_command_line, c6x_command_line, COMMAND_LINE_SIZE);
         parse_early_param();
 }
 
@@ -309,7 +300,7 @@ void __init setup_arch(char **cmdline_p)
         printk(KERN_INFO "Initializing kernel\n");
 
         /* Initialize command line */
-        *cmdline_p = c6x_command_line;
+        *cmdline_p = boot_command_line;
 
         memory_end = ram_end;
         memory_end &= ~(PAGE_SIZE - 1);
diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S
index 279d80725128..5a6e141d1641 100644
--- a/arch/c6x/kernel/vmlinux.lds.S
+++ b/arch/c6x/kernel/vmlinux.lds.S
@@ -37,12 +37,6 @@ SECTIONS
                 _vectors_end = .;
         }
 
-        . = ALIGN(0x1000);
-        .cmdline :
-        {
-                *(.cmdline)
-        }
-
         /*
          * This section contains data which may be shared with other
          * cores. It needs to be a fixed offset from PAGE_OFFSET
diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c
index 29d1f1b00016..0e7c1dbb37b2 100644
--- a/arch/hexagon/kernel/setup.c
+++ b/arch/hexagon/kernel/setup.c
@@ -32,9 +32,6 @@
 #include <asm/hexagon_vm.h>
 #include <asm/vm_mmu.h>
 #include <asm/time.h>
-#ifdef CONFIG_OF
-#include <asm/prom.h>
-#endif
 
 char cmd_line[COMMAND_LINE_SIZE];
 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
diff --git a/arch/metag/include/asm/mach/arch.h b/arch/metag/include/asm/mach/arch.h
index 12c5664fea6e..433f94624fa2 100644
--- a/arch/metag/include/asm/mach/arch.h
+++ b/arch/metag/include/asm/mach/arch.h
@@ -53,7 +53,7 @@ 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
diff --git a/arch/metag/include/asm/prom.h b/arch/metag/include/asm/prom.h
deleted file mode 100644
index d2aa35d2228e..000000000000
--- a/arch/metag/include/asm/prom.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  arch/metag/include/asm/prom.h
- *
- *  Copyright (C) 2012 Imagination Technologies Ltd.
- *
- *  Based on ARM version:
- *  Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.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_METAG_PROM_H
-#define __ASM_METAG_PROM_H
-
-#include <asm/setup.h>
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
-extern struct machine_desc *setup_machine_fdt(void *dt);
-extern void copy_fdt(void);
-
-#endif /* __ASM_METAG_PROM_H */
diff --git a/arch/metag/include/asm/setup.h b/arch/metag/include/asm/setup.h
index e13083b15dd0..e9fdee9452b1 100644
--- a/arch/metag/include/asm/setup.h
+++ b/arch/metag/include/asm/setup.h
@@ -3,6 +3,7 @@
 
 #include <uapi/asm/setup.h>
 
+extern const struct machine_desc *setup_machine_fdt(void *dt);
 void per_cpu_trap_init(unsigned long);
 extern void __init dump_machine_table(void);
 #endif /* _ASM_METAG_SETUP_H */
diff --git a/arch/metag/kernel/devtree.c b/arch/metag/kernel/devtree.c
index 7cd02529636e..18dd7aea9fdc 100644
--- a/arch/metag/kernel/devtree.c
+++ b/arch/metag/kernel/devtree.c
@@ -34,6 +34,19 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
         return alloc_bootmem_align(size, align);
 }
 
+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
@@ -41,74 +54,18 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
  * 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, *mdesc_best = NULL;
-        unsigned int score, mdesc_score = ~1;
-        unsigned long dt_root;
-        const char *model;
+        const struct machine_desc *mdesc;
 
         /* check device tree validity */
-        if (be32_to_cpu(devtree->magic) != OF_DT_HEADER)
+        if (!early_init_dt_scan(dt))
                 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) {
-                const char *prop;
-                long size;
-
-                pr_err("\nError: unrecognized/unsupported device tree compatible 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)
                 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);
-
-        return mdesc_best;
-}
+        pr_info("Machine name: %s\n", mdesc->name);
 
-/**
- * copy_fdt - Copy device tree into non-init memory.
- *
- * We must copy the flattened device tree blob into non-init memory because the
- * unflattened device tree will reference the strings in it directly.
- */
-void __init copy_fdt(void)
-{
-        void *alloc = early_init_dt_alloc_memory_arch(
-                        be32_to_cpu(initial_boot_params->totalsize), 0x40);
-        if (alloc) {
-                memcpy(alloc, initial_boot_params,
-                       be32_to_cpu(initial_boot_params->totalsize));
-                initial_boot_params = alloc;
-        }
+        return mdesc;
 }
diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c
index e639bae09645..129c7cdda1ce 100644
--- a/arch/metag/kernel/setup.c
+++ b/arch/metag/kernel/setup.c
@@ -42,7 +42,6 @@
 #include <asm/mmu.h>
 #include <asm/mmzone.h>
 #include <asm/processor.h>
-#include <asm/prom.h>
 #include <asm/sections.h>
 #include <asm/setup.h>
 #include <asm/traps.h>
@@ -115,7 +114,7 @@ extern u32 __dtb_start[];
 extern struct console dash_console;
 #endif
 
-struct machine_desc *machine_desc __initdata;
+const struct machine_desc *machine_desc __initdata;
 
 /*
  * Map a Linux CPU number to a hardware thread ID
@@ -404,9 +403,7 @@ void __init setup_arch(char **cmdline_p)
         cpu_2_hwthread_id[smp_processor_id()] = hard_processor_id();
         hwthread_id_2_cpu[hard_processor_id()] = smp_processor_id();
 
-        /* Copy device tree blob into non-init memory before unflattening */
-        copy_fdt();
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 
 #ifdef CONFIG_SMP
         smp_init_cpus();
diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c
index 123919534b80..249fff66add3 100644
--- a/arch/metag/mm/init.c
+++ b/arch/metag/mm/init.c
@@ -12,7 +12,6 @@
 #include <linux/percpu.h>
 #include <linux/memblock.h>
 #include <linux/initrd.h>
-#include <linux/of_fdt.h>
 
 #include <asm/setup.h>
 #include <asm/page.h>
@@ -405,11 +404,3 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                            "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 */
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index d52abb6812fa..935f9bec414a 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -127,8 +127,6 @@ extern void of_scan_pci_bridge(struct device_node *node,
 extern void of_scan_bus(struct device_node *node, struct pci_bus *bus);
 extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus);
 
-extern int pci_read_irq_line(struct pci_dev *dev);
-
 extern int pci_bus_find_capability(struct pci_bus *bus,
                                                 unsigned int devfn, int cap);
 
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 9977816c5ad3..2f03ac815851 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -11,19 +11,10 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
-
-#include <linux/of.h>   /* linux/of.h gets to determine #include ordering */
-
 #ifndef _ASM_MICROBLAZE_PROM_H
 #define _ASM_MICROBLAZE_PROM_H
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-#include <linux/types.h>
-#include <asm/irq.h>
-#include <linux/atomic.h>
 
-#define HAVE_ARCH_DEVTREE_FIXUPS
+#include <linux/of.h>
 
 /* Other Prototypes */
 enum early_consoles {
@@ -33,32 +24,4 @@ enum early_consoles {
 
 extern int of_early_console(void *version);
 
-/*
- * OF address retreival & translation
- */
-
-#ifdef CONFIG_PCI
-extern unsigned long pci_address_to_pio(phys_addr_t address);
-#define pci_address_to_pio pci_address_to_pio
-#endif  /* CONFIG_PCI */
-
-/* Parse the ibm,dma-window property of an OF node into the busno, phys and
- * size parameters.
- */
-void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
-                unsigned long *busno, unsigned long *phys, unsigned long *size);
-
-extern void kdump_move_device_tree(void);
-
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-
-/* These includes are put at the bottom because they may contain things
- * that are overridden by this file.  Ideally they shouldn't be included
- * by this file, but there are a bunch of .c files that currently depend
- * on it.  Eventually they will be cleaned up. */
-#include <linux/of_fdt.h>
-#include <linux/of_irq.h>
-#include <linux/platform_device.h>
-
 #endif /* _ASM_MICROBLAZE_PROM_H */
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 0c4453f134cb..abdfb10e7eca 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -30,6 +30,7 @@
 #include <linux/debugfs.h>
 #include <linux/irq.h>
 #include <linux/memblock.h>
+#include <linux/of_fdt.h>
 
 #include <asm/prom.h>
 #include <asm/page.h>
@@ -41,11 +42,6 @@
 #include <asm/sections.h>
 #include <asm/pci-bridge.h>
 
-void __init early_init_dt_add_memory_arch(u64 base, u64 size)
-{
-        memblock_add(base, size);
-}
-
 #ifdef CONFIG_EARLY_PRINTK
 static char *stdout;
 
@@ -106,21 +102,10 @@ void __init early_init_devtree(void *params)
 {
         pr_debug(" -> early_init_devtree(%p)\n", params);
 
-        /* Setup flat device-tree pointer */
-        initial_boot_params = params;
-
-        /* Retrieve various informations from the /chosen node of the
-         * device-tree, including the platform type, initrd location and
-         * size, TCE reserve, and more ...
-         */
-        of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);
-
-        /* Scan memory nodes and rebuild MEMBLOCKs */
-        of_scan_flat_dt(early_init_dt_scan_root, NULL);
-        of_scan_flat_dt(early_init_dt_scan_memory, NULL);
+        early_init_dt_scan(params);
+        if (!strlen(boot_command_line))
+                strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
 
-        /* Save command line for /proc/cmdline and then parse parameters */
-        strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
         parse_early_param();
 
         memblock_allow_resize();
@@ -130,15 +115,6 @@ void __init early_init_devtree(void *params)
         pr_debug(" <- early_init_devtree()\n");
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (unsigned long)__va(start);
-        initrd_end = (unsigned long)__va(end);
-        initrd_below_start_ok = 1;
-}
-#endif
-
 /*******
  *
  * New implementation of the OF "find" APIs, return a refcounted
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 0775e036c526..8de8ebc309f1 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -16,6 +16,7 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/debugfs.h>
+#include <linux/of_fdt.h>
 
 #include <asm/setup.h>
 #include <asm/sections.h>
@@ -50,7 +51,7 @@ char cmd_line[COMMAND_LINE_SIZE] __attribute__ ((section(".data")));
 
 void __init setup_arch(char **cmdline_p)
 {
-        *cmdline_p = cmd_line;
+        *cmdline_p = boot_command_line;
 
         console_verbose();
 
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index d7abb71abf61..3e39b1082fdf 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -15,6 +15,7 @@
 #include <linux/clk.h>
 #include <linux/clockchips.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/cpuinfo.h>
 #include <linux/cnt32_to_63.h>
 
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 1b93bf0892a0..66804adcacf0 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_pci.h>
 #include <linux/export.h>
 
@@ -193,76 +194,6 @@ void pcibios_set_master(struct pci_dev *dev)
 }
 
 /*
- * Reads the interrupt pin to determine if interrupt is use by card.
- * If the interrupt is used, then gets the interrupt line from the
- * openfirmware and sets it in the pci_dev and pci_config line.
- */
-int pci_read_irq_line(struct pci_dev *pci_dev)
-{
-        struct of_irq oirq;
-        unsigned int virq;
-
-        /* The current device-tree that iSeries generates from the HV
-         * PCI informations doesn't contain proper interrupt routing,
-         * and all the fallback would do is print out crap, so we
-         * don't attempt to resolve the interrupts here at all, some
-         * iSeries specific fixup does it.
-         *
-         * In the long run, we will hopefully fix the generated device-tree
-         * instead.
-         */
-        pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
-
-#ifdef DEBUG
-        memset(&oirq, 0xff, sizeof(oirq));
-#endif
-        /* Try to get a mapping from the device-tree */
-        if (of_irq_map_pci(pci_dev, &oirq)) {
-                u8 line, pin;
-
-                /* If that fails, lets fallback to what is in the config
-                 * space and map that through the default controller. We
-                 * also set the type to level low since that's what PCI
-                 * interrupts are. If your platform does differently, then
-                 * either provide a proper interrupt tree or don't use this
-                 * function.
-                 */
-                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &pin))
-                        return -1;
-                if (pin == 0)
-                        return -1;
-                if (pci_read_config_byte(pci_dev, PCI_INTERRUPT_LINE, &line) ||
-                    line == 0xff || line == 0) {
-                        return -1;
-                }
-                pr_debug(" No map ! Using line %d (pin %d) from PCI config\n",
-                         line, pin);
-
-                virq = irq_create_mapping(NULL, line);
-                if (virq)
-                        irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
-        } else {
-                pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
-                         oirq.size, oirq.specifier[0], oirq.specifier[1],
-                         of_node_full_name(oirq.controller));
-
-                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                             oirq.size);
-        }
-        if (!virq) {
-                pr_debug(" Failed to map !\n");
-                return -1;
-        }
-
-        pr_debug(" Mapped to linux irq %d\n", virq);
-
-        pci_dev->irq = virq;
-
-        return 0;
-}
-EXPORT_SYMBOL(pci_read_irq_line);
-
-/*
  * Platform support for /proc/bus/pci/X/Y mmap()s,
  * modelled on the sparc64 implementation by Dave Miller.
  *  -- paulus.
@@ -960,7 +891,7 @@ void pcibios_setup_bus_devices(struct pci_bus *bus)
                 dev->dev.archdata.dma_data = (void *)PCI_DRAM_OFFSET;
 
                 /* Read default IRQs and fixup if necessary */
-                pci_read_irq_line(dev);
+                dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
         }
 }
 
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index 17daffb280a3..470f2095b346 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -69,6 +69,7 @@ void nlm_hal_init(void);
 int xlp_get_dram_map(int n, uint64_t *dram_map);
 
 /* Device tree related */
+void xlp_early_init_devtree(void);
 void *xlp_dt_init(void *fdtp);
 
 static inline int cpu_is_xlpii(void)
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
index 1e7e0961064b..ccd2b75f152c 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
@@ -17,22 +17,8 @@
 #include <linux/types.h>
 #include <asm/bootinfo.h>
 
-extern int early_init_dt_scan_memory_arch(unsigned long node,
-        const char *uname, int depth, void *data);
-
 extern void device_tree_init(void);
 
-static inline unsigned long pci_address_to_pio(phys_addr_t address)
-{
-        /*
-         * The ioport address can be directly used by inX() / outX()
-         */
-        BUG_ON(address > IO_SPACE_LIMIT);
-
-        return (unsigned long) address;
-}
-#define pci_address_to_pio pci_address_to_pio
-
 struct boot_param_header;
 
 extern void __dt_setup_arch(struct boot_param_header *bph);
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 0fa0b69cdd53..3c3b0df8f48d 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -13,12 +13,9 @@
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/bootmem.h>
-#include <linux/initrd.h>
 #include <linux/debugfs.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
-#include <linux/of_irq.h>
-#include <linux/of_platform.h>
 
 #include <asm/page.h>
 #include <asm/prom.h>
@@ -40,13 +37,6 @@ char *mips_get_machine_name(void)
 }
 
 #ifdef CONFIG_OF
-int __init early_init_dt_scan_memory_arch(unsigned long node,
-                                          const char *uname, int depth,
-                                          void *data)
-{
-        return early_init_dt_scan_memory(node, uname, depth, data);
-}
-
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
         return add_memory_region(base, size, BOOT_MEM_RAM);
@@ -57,57 +47,11 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
         return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (unsigned long)__va(start);
-        initrd_end = (unsigned long)__va(end);
-        initrd_below_start_ok = 1;
-}
-#endif
-
-int __init early_init_dt_scan_model(unsigned long node, const char *uname,
-                                    int depth, void *data)
-{
-        if (!depth) {
-                char *model = of_get_flat_dt_prop(node, "model", NULL);
-
-                if (model)
-                        mips_set_machine_name(model);
-        }
-        return 0;
-}
-
-void __init early_init_devtree(void *params)
-{
-        /* Setup flat device-tree pointer */
-        initial_boot_params = params;
-
-        /* Retrieve various informations from the /chosen node of the
-         * device-tree, including the platform type, initrd location and
-         * size, and more ...
-         */
-        of_scan_flat_dt(early_init_dt_scan_chosen, arcs_cmdline);
-
-
-        /* Scan memory nodes */
-        of_scan_flat_dt(early_init_dt_scan_root, NULL);
-        of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
-
-        /* try to load the mips machine name */
-        of_scan_flat_dt(early_init_dt_scan_model, NULL);
-}
-
 void __init __dt_setup_arch(struct boot_param_header *bph)
 {
-        if (be32_to_cpu(bph->magic) != OF_DT_HEADER) {
-                pr_err("DTB has bad magic, ignoring builtin OF DTB\n");
-
+        if (!early_init_dt_scan(bph))
                 return;
-        }
-
-        initial_boot_params = bph;
 
-        early_init_devtree(initial_boot_params);
+        mips_set_machine_name(of_flat_dt_get_machine_name());
 }
 #endif
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index 49c460370285..19686c5bc5ed 100644
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -14,6 +14,7 @@
 
 #include <asm/bootinfo.h>
 #include <asm/time.h>
+#include <asm/prom.h>
 
 #include <lantiq.h>
 
diff --git a/arch/mips/mti-sead3/sead3-setup.c b/arch/mips/mti-sead3/sead3-setup.c
index b5059dc899f4..928ba84c8a78 100644
--- a/arch/mips/mti-sead3/sead3-setup.c
+++ b/arch/mips/mti-sead3/sead3-setup.c
@@ -10,6 +10,8 @@
 #include <linux/of_fdt.h>
 #include <linux/bootmem.h>
 
+#include <asm/prom.h>
+
 #include <asm/mips-boards/generic.h>
 
 const char *get_system_type(void)
diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c
index 88df445dda76..8316d5454b17 100644
--- a/arch/mips/netlogic/xlp/dt.c
+++ b/arch/mips/netlogic/xlp/dt.c
@@ -39,8 +39,11 @@
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
 
+#include <asm/prom.h>
+
 extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[],
         __dtb_xlp_fvp_begin[], __dtb_start[];
+static void *xlp_fdt_blob;
 
 void __init *xlp_dt_init(void *fdtp)
 {
@@ -67,19 +70,26 @@ void __init *xlp_dt_init(void *fdtp)
                         break;
                 }
         }
-        initial_boot_params = fdtp;
+        xlp_fdt_blob = fdtp;
         return fdtp;
 }
 
+void __init xlp_early_init_devtree(void)
+{
+        __dt_setup_arch(xlp_fdt_blob);
+        strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+}
+
 void __init device_tree_init(void)
 {
         unsigned long base, size;
+        struct boot_param_header *fdtp = xlp_fdt_blob;
 
-        if (!initial_boot_params)
+        if (!fdtp)
                 return;
 
-        base = virt_to_phys((void *)initial_boot_params);
-        size = be32_to_cpu(initial_boot_params->totalsize);
+        base = virt_to_phys(fdtp);
+        size = be32_to_cpu(fdtp->totalsize);
 
         /* Before we do anything, lets reserve the dt blob */
         reserve_bootmem(base, size, BOOTMEM_DEFAULT);
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 76a7131e486e..6d981bb337ec 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -98,7 +98,7 @@ void __init plat_mem_setup(void)
         pm_power_off    = nlm_linux_exit;
 
         /* memory and bootargs from DT */
-        early_init_devtree(initial_boot_params);
+        xlp_early_init_devtree();
 
         if (boot_mem_map.nr_map == 0) {
                 pr_info("Using DRAM BARs for memory map.\n");
diff --git a/arch/mips/pci/fixup-lantiq.c b/arch/mips/pci/fixup-lantiq.c
index 6c829df28dc7..c2ce41ea61d7 100644
--- a/arch/mips/pci/fixup-lantiq.c
+++ b/arch/mips/pci/fixup-lantiq.c
@@ -25,16 +25,5 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
-        struct of_irq dev_irq;
-        int irq;
-
-        if (of_irq_map_pci(dev, &dev_irq)) {
-                dev_err(&dev->dev, "trying to map irq for unknown slot:%d pin:%d\n",
-                        slot, pin);
-                return 0;
-        }
-        irq = irq_create_of_mapping(dev_irq.controller, dev_irq.specifier,
-                                        dev_irq.size);
-        dev_info(&dev->dev, "SLOT:%d PIN:%d IRQ:%d\n", slot, pin, irq);
-        return irq;
+        return of_irq_parse_and_map_pci(dev, slot, pin);
 }
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index 95c9d41382e7..adeff2bfe4cd 100644
--- a/arch/mips/pci/pci-rt3883.c
+++ b/arch/mips/pci/pci-rt3883.c
@@ -583,29 +583,7 @@ err_put_intc_node:
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
-        struct of_irq dev_irq;
-        int err;
-        int irq;
-
-        err = of_irq_map_pci(dev, &dev_irq);
-        if (err) {
-                pr_err("pci %s: unable to get irq map, err=%d\n",
-                       pci_name((struct pci_dev *) dev), err);
-                return 0;
-        }
-
-        irq = irq_create_of_mapping(dev_irq.controller,
-                                    dev_irq.specifier,
-                                    dev_irq.size);
-
-        if (irq == 0)
-                pr_crit("pci %s: no irq found for pin %u\n",
-                        pci_name((struct pci_dev *) dev), pin);
-        else
-                pr_info("pci %s: using irq %d for pin %u\n",
-                        pci_name((struct pci_dev *) dev), irq, pin);
-
-        return irq;
+        return of_irq_parse_and_map_pci(dev, slot, pin);
 }
 
 int pcibios_plat_dev_init(struct pci_dev *dev)
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 15f21ea96121..eccc5526155e 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -21,6 +21,7 @@
 #include <asm/reboot.h>
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
+#include <asm/prom.h>
 
 #include "common.h"
 
diff --git a/arch/openrisc/include/asm/prom.h b/arch/openrisc/include/asm/prom.h
deleted file mode 100644
index 93c9980e1b6b..000000000000
--- a/arch/openrisc/include/asm/prom.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * OpenRISC Linux
- *
- * Linux architectural port borrowing liberally from similar works of
- * others.  All original copyrights apply as per the original source
- * declaration.
- *
- * OpenRISC implementation:
- * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
- * et al.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-#ifndef _ASM_OPENRISC_PROM_H
-#define _ASM_OPENRISC_PROM_H
-
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
-#endif /* _ASM_OPENRISC_PROM_H */
diff --git a/arch/openrisc/kernel/prom.c b/arch/openrisc/kernel/prom.c
index a63e76872f84..6a44340d1b18 100644
--- a/arch/openrisc/kernel/prom.c
+++ b/arch/openrisc/kernel/prom.c
@@ -18,83 +18,15 @@
  *
  */
 
-#include <stdarg.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
 #include <linux/init.h>
-#include <linux/threads.h>
-#include <linux/spinlock.h>
 #include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/stringify.h>
-#include <linux/delay.h>
-#include <linux/initrd.h>
-#include <linux/bitops.h>
-#include <linux/module.h>
-#include <linux/kexec.h>
-#include <linux/debugfs.h>
-#include <linux/irq.h>
 #include <linux/memblock.h>
 #include <linux/of_fdt.h>
 
-#include <asm/prom.h>
 #include <asm/page.h>
-#include <asm/processor.h>
-#include <asm/irq.h>
-#include <linux/io.h>
-#include <asm/mmu.h>
-#include <asm/pgtable.h>
-#include <asm/sections.h>
-#include <asm/setup.h>
-
-extern char cmd_line[COMMAND_LINE_SIZE];
-
-void __init early_init_dt_add_memory_arch(u64 base, u64 size)
-{
-        size &= PAGE_MASK;
-        memblock_add(base, size);
-}
 
 void __init early_init_devtree(void *params)
 {
-        void *alloc;
-
-        /* Setup flat device-tree pointer */
-        initial_boot_params = params;
-
-
-        /* Retrieve various informations from the /chosen node of the
-         * device-tree, including the platform type, initrd location and
-         * size, TCE reserve, and more ...
-         */
-        of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);
-
-        /* Scan memory nodes and rebuild MEMBLOCKs */
-        of_scan_flat_dt(early_init_dt_scan_root, NULL);
-        of_scan_flat_dt(early_init_dt_scan_memory, NULL);
-
-        /* Save command line for /proc/cmdline and then parse parameters */
-        strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
-
+        early_init_dt_scan(params);
         memblock_allow_resize();
-
-        /* We must copy the flattend device tree from init memory to regular
-         * memory because the device tree references the strings in it
-         * directly.
-         */
-
-        alloc = __va(memblock_alloc(initial_boot_params->totalsize, PAGE_SIZE));
-
-        memcpy(alloc, initial_boot_params, initial_boot_params->totalsize);
-
-        initial_boot_params = alloc;
-}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (unsigned long)__va(start);
-        initrd_end = (unsigned long)__va(end);
-        initrd_below_start_ok = 1;
 }
-#endif
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index d7359ffbcbdd..09a769b69572 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -50,8 +50,6 @@
 
 #include "vmlinux.h"
 
-char __initdata cmd_line[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
-
 static unsigned long __init setup_memory(void)
 {
         unsigned long bootmap_size;
@@ -285,7 +283,7 @@ void __init setup_arch(char **cmdline_p)
 {
         unsigned long max_low_pfn;
 
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 
         setup_cpuinfo();
 
@@ -316,7 +314,7 @@ void __init setup_arch(char **cmdline_p)
                 conswitchp = &dummy_con;
 #endif
 
-        *cmdline_p = cmd_line;
+        *cmdline_p = boot_command_line;
 
         printk(KERN_INFO "OpenRISC Linux -- http://openrisc.net\n");
 }
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index bf09e5a065b8..d977b9b78696 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -1,4 +1,3 @@
-#include <linux/of.h>   /* linux/of.h gets to determine #include ordering */
 #ifndef _POWERPC_PROM_H
 #define _POWERPC_PROM_H
 #ifdef __KERNEL__
@@ -20,21 +19,17 @@
 #include <asm/irq.h>
 #include <linux/atomic.h>
 
-#define HAVE_ARCH_DEVTREE_FIXUPS
+/* These includes should be removed once implicit includes are cleaned up. */
+#include <linux/of.h>
+#include <linux/of_fdt.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/platform_device.h>
 
 /*
  * OF address retreival & translation
  */
 
-/* Translate a DMA address from device space to CPU space */
-extern u64 of_translate_dma_address(struct device_node *dev,
-                                    const __be32 *in_addr);
-
-#ifdef CONFIG_PCI
-extern unsigned long pci_address_to_pio(phys_addr_t address);
-#define pci_address_to_pio pci_address_to_pio
-#endif  /* CONFIG_PCI */
-
 /* Parse the ibm,dma-window property of an OF node into the busno, phys and
  * size parameters.
  */
@@ -44,13 +39,6 @@ void of_parse_dma_window(struct device_node *dn, const __be32 *dma_window,
 
 extern void kdump_move_device_tree(void);
 
-#ifdef CONFIG_NUMA
-extern int of_node_to_nid(struct device_node *device);
-#else
-static inline int of_node_to_nid(struct device_node *device) { return 0; }
-#endif
-#define of_node_to_nid of_node_to_nid
-
 extern void of_instantiate_rtc(void);
 
 extern int of_get_ibm_chip_id(struct device_node *np);
@@ -140,14 +128,5 @@ struct of_drconf_cell {
  */
 extern unsigned char ibm_architecture_vec[];
 
-/* These includes are put at the bottom because they may contain things
- * that are overridden by this file.  Ideally they shouldn't be included
- * by this file, but there are a bunch of .c files that currently depend
- * on it.  Eventually they will be cleaned up. */
-#include <linux/of_fdt.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
-#include <linux/platform_device.h>
-
 #endif /* __KERNEL__ */
 #endif /* _POWERPC_PROM_H */
diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index 6300c13bbde4..7898be90f2dc 100644
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/of.h>
+#include <linux/of_fdt.h>
 #include <asm/epapr_hcalls.h>
 #include <asm/cacheflush.h>
 #include <asm/code-patching.h>
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 905a24bb7acc..a1e3e40ca3fd 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -228,7 +228,7 @@ int pcibios_add_platform_entries(struct pci_dev *pdev)
  */
 static int pci_read_irq_line(struct pci_dev *pci_dev)
 {
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
         unsigned int virq;
 
         pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
@@ -237,7 +237,7 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
         memset(&oirq, 0xff, sizeof(oirq));
 #endif
         /* Try to get a mapping from the device-tree */
-        if (of_irq_map_pci(pci_dev, &oirq)) {
+        if (of_irq_parse_pci(pci_dev, &oirq)) {
                 u8 line, pin;
 
                 /* If that fails, lets fallback to what is in the config
@@ -263,11 +263,10 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
                         irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
         } else {
                 pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
-                         oirq.size, oirq.specifier[0], oirq.specifier[1],
-                         of_node_full_name(oirq.controller));
+                         oirq.args_count, oirq.args[0], oirq.args[1],
+                         of_node_full_name(oirq.np));
 
-                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                             oirq.size);
+                virq = irq_create_of_mapping(&oirq);
         }
         if(virq == NO_IRQ) {
                 pr_debug(" Failed to map !\n");
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 4432fd86a6d2..f3a47098fb8e 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -546,15 +546,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
         memblock_add(base, size);
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (unsigned long)__va(start);
-        initrd_end = (unsigned long)__va(end);
-        initrd_below_start_ok = 1;
-}
-#endif
-
 static void __init early_reserve_mem_dt(void)
 {
         unsigned long i, len, dt_root;
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
index e504166e089a..fd8a37653417 100644
--- a/arch/powerpc/platforms/512x/clock.c
+++ b/arch/powerpc/platforms/512x/clock.c
@@ -24,6 +24,7 @@
 #include <linux/mutex.h>
 #include <linux/io.h>
 
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/mpc5xxx.h>
 #include <asm/mpc5121.h>
diff --git a/arch/powerpc/platforms/512x/pdm360ng.c b/arch/powerpc/platforms/512x/pdm360ng.c
index 24b314d7bd5f..116f2325b20b 100644
--- a/arch/powerpc/platforms/512x/pdm360ng.c
+++ b/arch/powerpc/platforms/512x/pdm360ng.c
@@ -14,6 +14,8 @@
 
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 30394b409b3f..6a14cf50f4a2 100644
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -16,6 +16,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 
diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c
index e1dceeec4994..e5f82ec8df17 100644
--- a/arch/powerpc/platforms/82xx/pq2fads.c
+++ b/arch/powerpc/platforms/82xx/pq2fads.c
@@ -15,6 +15,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>
diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
index 1d769a29249f..3d9716ccd327 100644
--- a/arch/powerpc/platforms/83xx/suspend.c
+++ b/arch/powerpc/platforms/83xx/suspend.c
@@ -20,6 +20,8 @@
 #include <linux/freezer.h>
 #include <linux/suspend.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/export.h>
 
diff --git a/arch/powerpc/platforms/85xx/c293pcie.c b/arch/powerpc/platforms/85xx/c293pcie.c
index 6208e49142bf..213d5b815827 100644
--- a/arch/powerpc/platforms/85xx/c293pcie.c
+++ b/arch/powerpc/platforms/85xx/c293pcie.c
@@ -11,6 +11,7 @@
 
 #include <linux/stddef.h>
 #include <linux/kernel.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c
index d0861a0d8360..eba78c85303f 100644
--- a/arch/powerpc/platforms/85xx/common.c
+++ b/arch/powerpc/platforms/85xx/common.c
@@ -5,6 +5,8 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <sysdev/cpm2_pic.h>
diff --git a/arch/powerpc/platforms/85xx/ppa8548.c b/arch/powerpc/platforms/85xx/ppa8548.c
index 6a7704b92c3b..3daff7c63569 100644
--- a/arch/powerpc/platforms/85xx/ppa8548.c
+++ b/arch/powerpc/platforms/85xx/ppa8548.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/reboot.h>
 #include <linux/seq_file.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c
index 7179726ba5c5..b9197cea1854 100644
--- a/arch/powerpc/platforms/85xx/sgy_cts1000.c
+++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/of_gpio.h>
+#include <linux/of_irq.h>
 #include <linux/workqueue.h>
 #include <linux/reboot.h>
 #include <linux/interrupt.h>
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 281b7f01df63..393f975ab397 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/kexec.h>
 #include <linux/highmem.h>
 #include <linux/cpu.h>
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index 3bbbf7489487..55a9682b9529 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -9,6 +9,8 @@
  */
 
 #include <linux/irq.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 
diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c
index 9982f57c98b9..d5b98c0f958a 100644
--- a/arch/powerpc/platforms/86xx/pic.c
+++ b/arch/powerpc/platforms/86xx/pic.c
@@ -10,6 +10,7 @@
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/mpic.h>
diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
index 7d9ac6040d63..e62166681d08 100644
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -10,6 +10,8 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index 866feff83c91..63084640c5c5 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -15,6 +15,8 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 5d98398c2f5e..c1262581b63c 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -25,6 +25,8 @@
 #include <linux/fs_uart_pd.h>
 #include <linux/fsl_devices.h>
 #include <linux/mii.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/delay.h>
diff --git a/arch/powerpc/platforms/8xx/tqm8xx_setup.c b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
index ef0778a0ca8f..251aba8759e4 100644
--- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@ -28,6 +28,7 @@
 #include <linux/fs_uart_pd.h>
 #include <linux/fsl_devices.h>
 #include <linux/mii.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
 #include <asm/delay.h>
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index 14be2bd358b8..4278acfa2ede 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -486,7 +486,6 @@ static __init int celleb_setup_pciex(struct device_node *node,
                                      struct pci_controller *phb)
 {
         struct resource r;
-        struct of_irq oirq;
         int virq;
 
         /* SMMIO registers; used inside this file */
@@ -507,12 +506,11 @@ static __init int celleb_setup_pciex(struct device_node *node,
         phb->ops = &scc_pciex_pci_ops;
 
         /* internal interrupt handler */
-        if (of_irq_map_one(node, 1, &oirq)) {
+        virq = irq_of_parse_and_map(node, 1);
+        if (!virq) {
                 pr_err("PCIEXC:Failed to map irq\n");
                 goto error;
         }
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                     oirq.size);
         if (request_irq(virq, pciex_handle_internal_irq,
                         0, "pciex", (void *)phb)) {
                 pr_err("PCIEXC:Failed to request irq\n");
diff --git a/arch/powerpc/platforms/cell/celleb_scc_sio.c b/arch/powerpc/platforms/cell/celleb_scc_sio.c
index 9c339ec646f5..c8eb57193826 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_sio.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_sio.c
@@ -45,7 +45,7 @@ static int __init txx9_serial_init(void)
         struct device_node *node;
         int i;
         struct uart_port req;
-        struct of_irq irq;
+        struct of_phandle_args irq;
         struct resource res;
 
         for_each_compatible_node(node, "serial", "toshiba,sio-scc") {
@@ -53,7 +53,7 @@ static int __init txx9_serial_init(void)
                         if (!(txx9_serial_bitmap & (1<<i)))
                                 continue;
 
-                        if (of_irq_map_one(node, i, &irq))
+                        if (of_irq_parse_one(node, i, &irq))
                                 continue;
                         if (of_address_to_resource(node,
                                 txx9_scc_tab[i].index, &res))
@@ -66,8 +66,7 @@ static int __init txx9_serial_init(void)
 #ifdef CONFIG_SERIAL_TXX9_CONSOLE
                         req.membase = ioremap(req.mapbase, 0x24);
 #endif
-                        req.irq = irq_create_of_mapping(irq.controller,
-                                irq.specifier, irq.size);
+                        req.irq = irq_create_of_mapping(&irq);
                         req.flags |= UPF_IOREMAP | UPF_BUGGY_UART
                                 /*HAVE_CTS_LINE*/;
                         req.uartclk = 83300000;
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 8e299447127e..1f72f4ab6353 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -235,12 +235,9 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
         /* First, we check whether we have a real "interrupts" in the device
          * tree in case the device-tree is ever fixed
          */
-        struct of_irq oirq;
-        if (of_irq_map_one(pic->host->of_node, 0, &oirq) == 0) {
-                virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                             oirq.size);
+        virq = irq_of_parse_and_map(pic->host->of_node, 0);
+        if (virq)
                 return virq;
-        }
 
         /* Now do the horrible hacks */
         tmp = of_get_property(pic->host->of_node, "#interrupt-cells", NULL);
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 2bb6977c0a5a..c3327f3d8cf7 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -177,21 +177,20 @@ out:
 
 static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
 {
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
         int ret;
         int i;
 
         for (i=0; i < 3; i++) {
-                ret = of_irq_map_one(np, i, &oirq);
+                ret = of_irq_parse_one(np, i, &oirq);
                 if (ret) {
                         pr_debug("spu_new: failed to get irq %d\n", i);
                         goto err;
                 }
                 ret = -EINVAL;
-                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.specifier[0],
-                         oirq.controller->full_name);
-                spu->irqs[i] = irq_create_of_mapping(oirq.controller,
-                                        oirq.specifier, oirq.size);
+                pr_debug("  irq %d no 0x%x on %s\n", i, oirq.args[0],
+                         oirq.np->full_name);
+                spu->irqs[i] = irq_create_of_mapping(&oirq);
                 if (spu->irqs[i] == NO_IRQ) {
                         pr_debug("spu_new: failed to map it !\n");
                         goto err;
@@ -200,7 +199,7 @@ static int __init spu_map_interrupts(struct spu *spu, struct device_node *np)
         return 0;
 
 err:
-        pr_debug("failed to map irq %x for spu %s\n", *oirq.specifier,
+        pr_debug("failed to map irq %x for spu %s\n", *oirq.args,
                 spu->name);
         for (; i >= 0; i--) {
                 if (spu->irqs[i] != NO_IRQ)
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index 53d6eee01963..4cde8e7da4b8 100644
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <asm/io.h>
 
 #include "flipper-pic.h"
diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index 6f61e21b3617..6c03034dbbd3 100644
--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -18,6 +18,8 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/io.h>
 
 #include "hlwd-pic.h"
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index 92ac9b52b32d..b97f6f3d3c5b 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -321,8 +321,7 @@ static void hpcd_final_uli5288(struct pci_dev *dev)
 {
         struct pci_controller *hose = pci_bus_to_host(dev->bus);
         struct device_node *hosenode = hose ? hose->dn : NULL;
-        struct of_irq oirq;
-        int virq, pin = 2;
+        struct of_phandle_args oirq;
         u32 laddr[3];
 
         if (!machine_is(mpc86xx_hpcd))
@@ -331,12 +330,13 @@ static void hpcd_final_uli5288(struct pci_dev *dev)
         if (!hosenode)
                 return;
 
+        oirq.np = hosenode;
+        oirq.args[0] = 2;
+        oirq.args_count = 1;
         laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(31, 0) << 8);
         laddr[1] = laddr[2] = 0;
-        of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq);
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                     oirq.size);
-        dev->irq = virq;
+        of_irq_parse_raw(laddr, &oirq);
+        dev->irq = irq_create_of_mapping(&oirq);
 }
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, hpcd_quirk_uli1575);
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index 0237ab782fb8..15adee544638 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -30,6 +30,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/phy.h>
+#include <linux/of_address.h>
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c
index f5e3cda6660e..e49d07f3d542 100644
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -4,6 +4,7 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/of_irq.h>
 
 #include <asm/pmac_feature.h>
 #include <asm/pmac_pfunc.h>
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 31036b56670e..4c24bf60d39d 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -393,8 +393,8 @@ static void __init pmac_pic_probe_oldstyle(void)
 #endif
 }
 
-int of_irq_map_oldworld(struct device_node *device, int index,
-                        struct of_irq *out_irq)
+int of_irq_parse_oldworld(struct device_node *device, int index,
+                        struct of_phandle_args *out_irq)
 {
         const u32 *ints = NULL;
         int intlen;
@@ -422,9 +422,9 @@ int of_irq_map_oldworld(struct device_node *device, int index,
         if (index >= intlen)
                 return -EINVAL;
 
-        out_irq->controller = NULL;
-        out_irq->specifier[0] = ints[index];
-        out_irq->size = 1;
+        out_irq->np = NULL;
+        out_irq->args[0] = ints[index];
+        out_irq->args_count = 1;
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c
index a7614bb14e17..e7e59e4f9892 100644
--- a/arch/powerpc/platforms/powernv/opal-lpc.c
+++ b/arch/powerpc/platforms/powernv/opal-lpc.c
@@ -17,6 +17,7 @@
 #include <asm/firmware.h>
 #include <asm/xics.h>
 #include <asm/opal.h>
+#include <asm/prom.h>
 
 static int opal_lpc_chip_id = -1;
 
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index b56c243aaee9..1c798cd55372 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -13,6 +13,7 @@
 
 #include <linux/types.h>
 #include <linux/of.h>
+#include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
 #include <linux/notifier.h>
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index e239dcfa224c..19884b2a51b4 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -23,6 +23,7 @@
 #include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/of.h>
+#include <linux/of_fdt.h>
 #include <linux/interrupt.h>
 #include <linux/bug.h>
 
diff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c
index 2605c310166a..18380e8f6dfe 100644
--- a/arch/powerpc/platforms/pseries/event_sources.c
+++ b/arch/powerpc/platforms/pseries/event_sources.c
@@ -25,7 +25,7 @@ void request_event_sources_irqs(struct device_node *np,
                                 const char *name)
 {
         int i, index, count = 0;
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
         const u32 *opicprop;
         unsigned int opicplen;
         unsigned int virqs[16];
@@ -55,13 +55,11 @@ void request_event_sources_irqs(struct device_node *np,
         /* Else use normal interrupt tree parsing */
         else {
                 /* First try to do a proper OF tree parsing */
-                for (index = 0; of_irq_map_one(np, index, &oirq) == 0;
+                for (index = 0; of_irq_parse_one(np, index, &oirq) == 0;
                      index++) {
                         if (count > 15)
                                 break;
-                        virqs[count] = irq_create_of_mapping(oirq.controller,
-                                                            oirq.specifier,
-                                                            oirq.size);
+                        virqs[count] = irq_create_of_mapping(&oirq);
                         if (virqs[count] == NO_IRQ) {
                                 pr_err("event-sources: Unable to allocate "
                                        "interrupt number for %s\n",
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 9a432de363b8..9590dbb756f2 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -10,12 +10,14 @@
  */
 
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/memblock.h>
 #include <linux/vmalloc.h>
 #include <linux/memory.h>
 
 #include <asm/firmware.h>
 #include <asm/machdep.h>
+#include <asm/prom.h>
 #include <asm/sparsemem.h>
 
 static unsigned long get_memblock_size(void)
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c
index 4dd534194ae8..4f7869571290 100644
--- a/arch/powerpc/sysdev/cpm_common.c
+++ b/arch/powerpc/sysdev/cpm_common.c
@@ -22,6 +22,7 @@
 #include <linux/spinlock.h>
 #include <linux/export.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/slab.h>
 
 #include <asm/udbg.h>
diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c
index 9cd0e60716fe..b74085cea1af 100644
--- a/arch/powerpc/sysdev/ehv_pic.c
+++ b/arch/powerpc/sysdev/ehv_pic.c
@@ -19,6 +19,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c
index 0eb871cc3437..06ac3c61b3d0 100644
--- a/arch/powerpc/sysdev/fsl_gtm.c
+++ b/arch/powerpc/sysdev/fsl_gtm.c
@@ -19,6 +19,8 @@
 #include <linux/list.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
@@ -401,16 +403,15 @@ static int __init fsl_gtm_init(void)
                 gtm->clock = *clock;
 
                 for (i = 0; i < ARRAY_SIZE(gtm->timers); i++) {
-                        int ret;
-                        struct resource irq;
+                        unsigned int irq;
 
-                        ret = of_irq_to_resource(np, i, &irq);
-                        if (ret == NO_IRQ) {
+                        irq = irq_of_parse_and_map(np, i);
+                        if (irq == NO_IRQ) {
                                 pr_err("%s: not enough interrupts specified\n",
                                        np->full_name);
                                 goto err;
                         }
-                        gtm->timers[i].irq = irq.start;
+                        gtm->timers[i].irq = irq;
                         gtm->timers[i].gtm = gtm;
                 }
 
diff --git a/arch/powerpc/sysdev/fsl_pmc.c b/arch/powerpc/sysdev/fsl_pmc.c
index 592a0f8d527a..8cf4aa0e3a25 100644
--- a/arch/powerpc/sysdev/fsl_pmc.c
+++ b/arch/powerpc/sysdev/fsl_pmc.c
@@ -18,6 +18,7 @@
 #include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 
 struct pmc_regs {
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index e2fb3171f41b..95dd892e9904 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -28,6 +28,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c
index 14bd5221f28a..00e224a1048c 100644
--- a/arch/powerpc/sysdev/fsl_rmu.c
+++ b/arch/powerpc/sysdev/fsl_rmu.c
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index bdcb8588e492..0e166ed4cd16 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -535,7 +535,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase,
                 mpic->fixups[irq].data = readl(base + 4) | 0x80000000;
         }
 }
- 
+
 
 static void __init mpic_scan_ht_pics(struct mpic *mpic)
 {
@@ -1481,7 +1481,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
          * as a default instead of the value read from the HW.
          */
         last_irq = (greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
-                                >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT;    
+                                >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT;
         if (isu_size)
                 last_irq = isu_size  * MPIC_MAX_ISU - 1;
         of_property_read_u32(mpic->node, "last-interrupt-source", &last_irq);
@@ -1631,7 +1631,7 @@ void __init mpic_init(struct mpic *mpic)
                         /* start with vector = source number, and masked */
                         u32 vecpri = MPIC_VECPRI_MASK | i |
                                 (8 << MPIC_VECPRI_PRIORITY_SHIFT);
-                
+
                         /* check if protected */
                         if (mpic->protected && test_bit(i, mpic->protected))
                                 continue;
@@ -1640,7 +1640,7 @@ void __init mpic_init(struct mpic *mpic)
                         mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu);
                 }
         }
-        
+
         /* Init spurious vector */
         mpic_write(mpic->gregs, MPIC_INFO(GREG_SPURIOUS), mpic->spurious_vec);
 
diff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c
index c75325865a85..2c9b52aa266c 100644
--- a/arch/powerpc/sysdev/mpic_msgr.c
+++ b/arch/powerpc/sysdev/mpic_msgr.c
@@ -237,15 +237,13 @@ static int mpic_msgr_probe(struct platform_device *dev)
                 raw_spin_lock_init(&msgr->lock);
 
                 if (receive_mask & (1 << i)) {
-                        struct resource irq;
-
-                        if (of_irq_to_resource(np, irq_index, &irq) == NO_IRQ) {
+                        msgr->irq = irq_of_parse_and_map(np, irq_index);
+                        if (msgr->irq == NO_IRQ) {
                                 dev_err(&dev->dev,
                                                 "Missing interrupt specifier");
                                 kfree(msgr);
                                 return -EFAULT;
                         }
-                        msgr->irq = irq.start;
                         irq_index += 1;
                 } else {
                         msgr->irq = NO_IRQ;
diff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c
index bbf342c88314..7dc39f35a4cc 100644
--- a/arch/powerpc/sysdev/mpic_msi.c
+++ b/arch/powerpc/sysdev/mpic_msi.c
@@ -35,7 +35,7 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
         const struct irq_domain_ops *ops = mpic->irqhost->ops;
         struct device_node *np;
         int flags, index, i;
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
 
         pr_debug("mpic: found U3, guessing msi allocator setup\n");
 
@@ -63,9 +63,9 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
                 pr_debug("mpic: mapping hwirqs for %s\n", np->full_name);
 
                 index = 0;
-                while (of_irq_map_one(np, index++, &oirq) == 0) {
-                        ops->xlate(mpic->irqhost, NULL, oirq.specifier,
-                                                oirq.size, &hwirq, &flags);
+                while (of_irq_parse_one(np, index++, &oirq) == 0) {
+                        ops->xlate(mpic->irqhost, NULL, oirq.args,
+                                                oirq.args_count, &hwirq, &flags);
                         msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, hwirq);
                 }
         }
diff --git a/arch/powerpc/sysdev/mpic_timer.c b/arch/powerpc/sysdev/mpic_timer.c
index c06db92a4fb1..22d7d57eead9 100644
--- a/arch/powerpc/sysdev/mpic_timer.c
+++ b/arch/powerpc/sysdev/mpic_timer.c
@@ -19,7 +19,9 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/syscore_ops.h>
 #include <sysdev/fsl_soc.h>
 #include <asm/io.h>
diff --git a/arch/powerpc/sysdev/of_rtc.c b/arch/powerpc/sysdev/of_rtc.c
index c9e803f3e267..6f54b54b1328 100644
--- a/arch/powerpc/sysdev/of_rtc.c
+++ b/arch/powerpc/sysdev/of_rtc.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/init.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 
diff --git a/arch/powerpc/sysdev/ppc4xx_ocm.c b/arch/powerpc/sysdev/ppc4xx_ocm.c
index 1b15f93479c3..b7c43453236d 100644
--- a/arch/powerpc/sysdev/ppc4xx_ocm.c
+++ b/arch/powerpc/sysdev/ppc4xx_ocm.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <asm/rheap.h>
 #include <asm/ppc4xx_ocm.h>
 #include <linux/slab.h>
diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c
index 0debcc31ad70..5c77c9ba33aa 100644
--- a/arch/powerpc/sysdev/ppc4xx_soc.c
+++ b/arch/powerpc/sysdev/ppc4xx_soc.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/dcr.h>
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index 8d73c3c0bee6..83f943a8e0db 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -23,6 +23,8 @@
 #include <linux/kernel.h>
 #include <linux/irq.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/i8259.h>
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h
index 67c62578d170..11ebd659e7b6 100644
--- a/arch/sparc/include/asm/prom.h
+++ b/arch/sparc/include/asm/prom.h
@@ -43,10 +43,6 @@ extern int of_getintprop_default(struct device_node *np,
                                  const char *name,
                                  int def);
 extern int of_find_in_proplist(const char *list, const char *match, int len);
-#ifdef CONFIG_NUMA
-extern int of_node_to_nid(struct device_node *dp);
-#define of_node_to_nid of_node_to_nid
-#endif
 
 extern void prom_build_devicetree(void);
 extern void of_populate_present_mask(void);
@@ -63,13 +59,5 @@ extern char *of_console_options;
 extern void irq_trans_init(struct device_node *dp);
 extern char *build_path_component(struct device_node *dp);
 
-/* SPARC has local implementations */
-extern int of_address_to_resource(struct device_node *dev, int index,
-                                  struct resource *r);
-#define of_address_to_resource of_address_to_resource
-
-void __iomem *of_iomap(struct device_node *node, int index);
-#define of_iomap of_iomap
-
 #endif /* __KERNEL__ */
 #endif /* _SPARC_PROM_H */
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index d397d7fc5c28..6b39125eb927 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -373,6 +373,59 @@ static const char *get_mid_prop(void)
         return (tlb_type == spitfire ? "upa-portid" : "portid");
 }
 
+bool arch_find_n_match_cpu_physical_id(struct device_node *cpun,
+                                       int cpu, unsigned int *thread)
+{
+        const char *mid_prop = get_mid_prop();
+        int this_cpu_id;
+
+        /* On hypervisor based platforms we interrogate the 'reg'
+         * property.  On everything else we look for a 'upa-portis',
+         * 'portid', or 'cpuid' property.
+         */
+
+        if (tlb_type == hypervisor) {
+                struct property *prop = of_find_property(cpun, "reg", NULL);
+                u32 *regs;
+
+                if (!prop) {
+                        pr_warn("CPU node missing reg property\n");
+                        return false;
+                }
+                regs = prop->value;
+                this_cpu_id = regs[0] & 0x0fffffff;
+        } else {
+                this_cpu_id = of_getintprop_default(cpun, mid_prop, -1);
+
+                if (this_cpu_id < 0) {
+                        mid_prop = "cpuid";
+                        this_cpu_id = of_getintprop_default(cpun, mid_prop, -1);
+                }
+                if (this_cpu_id < 0) {
+                        pr_warn("CPU node missing cpu ID property\n");
+                        return false;
+                }
+        }
+        if (this_cpu_id == cpu) {
+                if (thread) {
+                        int proc_id = cpu_data(cpu).proc_id;
+
+                        /* On sparc64, the cpu thread information is obtained
+                         * either from OBP or the machine description.  We've
+                         * actually probed this information already long before
+                         * this interface gets called so instead of interrogating
+                         * both the OF node and the MDESC again, just use what
+                         * we discovered already.
+                         */
+                        if (proc_id < 0)
+                                proc_id = 0;
+                        *thread = proc_id;
+                }
+                return true;
+        }
+        return false;
+}
+
 static void *of_iterate_over_cpus(void *(*func)(struct device_node *, int, int), int arg)
 {
         struct device_node *dp;
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index bade6ac3b14f..fbeb06ed0eaa 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -39,10 +39,5 @@ static inline void x86_dtb_init(void) { }
 
 extern char cmd_line[COMMAND_LINE_SIZE];
 
-#define pci_address_to_pio pci_address_to_pio
-unsigned long pci_address_to_pio(phys_addr_t addr);
-
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 376dc7873447..d35078ea1446 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -20,22 +20,13 @@
 #include <asm/hpet.h>
 #include <asm/apic.h>
 #include <asm/pci_x86.h>
+#include <asm/setup.h>
 
 __initdata u64 initial_dtb;
 char __initdata cmd_line[COMMAND_LINE_SIZE];
 
 int __initdata of_ioapic;
 
-unsigned long pci_address_to_pio(phys_addr_t address)
-{
-        /*
-         * The ioport address can be directly used by inX / outX
-         */
-        BUG_ON(address >= (1 << 16));
-        return (unsigned long)address;
-}
-EXPORT_SYMBOL_GPL(pci_address_to_pio);
-
 void __init early_init_dt_scan_chosen_arch(unsigned long node)
 {
         BUG();
@@ -51,15 +42,6 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
         return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (unsigned long)__va(start);
-        initrd_end = (unsigned long)__va(end);
-        initrd_below_start_ok = 1;
-}
-#endif
-
 void __init add_dtb(u64 data)
 {
         initial_dtb = data + offsetof(struct setup_data, data);
@@ -105,7 +87,6 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
 
 static int x86_of_pci_irq_enable(struct pci_dev *dev)
 {
-        struct of_irq oirq;
         u32 virq;
         int ret;
         u8 pin;
@@ -116,12 +97,7 @@ static int x86_of_pci_irq_enable(struct pci_dev *dev)
         if (!pin)
                 return 0;
 
-        ret = of_irq_map_pci(dev, &oirq);
-        if (ret)
-                return ret;
-
-        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                        oirq.size);
+        virq = of_irq_parse_and_map_pci(dev, 0, 0);
         if (virq == 0)
                 return -EINVAL;
         dev->irq = virq;
@@ -230,7 +206,7 @@ static void __init dtb_apic_setup(void)
 static void __init x86_flattree_get_config(void)
 {
         u32 size, map_len;
-        void *new_dtb;
+        struct boot_param_header *dt;
 
         if (!initial_dtb)
                 return;
@@ -238,24 +214,17 @@ static void __init x86_flattree_get_config(void)
         map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK),
                         (u64)sizeof(struct boot_param_header));
 
-        initial_boot_params = early_memremap(initial_dtb, map_len);
-        size = be32_to_cpu(initial_boot_params->totalsize);
+        dt = early_memremap(initial_dtb, map_len);
+        size = be32_to_cpu(dt->totalsize);
         if (map_len < size) {
-                early_iounmap(initial_boot_params, map_len);
-                initial_boot_params = early_memremap(initial_dtb, size);
+                early_iounmap(dt, map_len);
+                dt = early_memremap(initial_dtb, size);
                 map_len = size;
         }
 
-        new_dtb = alloc_bootmem(size);
-        memcpy(new_dtb, initial_boot_params, size);
-        early_iounmap(initial_boot_params, map_len);
-
-        initial_boot_params = new_dtb;
-
-        /* root level address cells */
-        of_scan_flat_dt(early_init_dt_scan_root, NULL);
-
-        unflatten_device_tree();
+        initial_boot_params = dt;
+        unflatten_and_copy_device_tree();
+        early_iounmap(dt, map_len);
 }
 #else
 static inline void x86_flattree_get_config(void) { }
diff --git a/arch/xtensa/include/asm/prom.h b/arch/xtensa/include/asm/prom.h
deleted file mode 100644
index f3d7cd2c0de7..000000000000
--- a/arch/xtensa/include/asm/prom.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _XTENSA_ASM_PROM_H
-#define _XTENSA_ASM_PROM_H
-
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
-#endif /* _XTENSA_ASM_PROM_H */
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 946fb8d06c8b..6e2b6638122d 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -21,11 +21,8 @@
 #include <linux/screen_info.h>
 #include <linux/bootmem.h>
 #include <linux/kernel.h>
-
-#ifdef CONFIG_OF
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
-#endif
 
 #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
 # include <linux/console.h>
@@ -64,8 +61,8 @@ extern struct rtc_ops no_rtc_ops;
 struct rtc_ops *rtc_ops;
 
 #ifdef CONFIG_BLK_DEV_INITRD
-extern void *initrd_start;
-extern void *initrd_end;
+extern unsigned long initrd_start;
+extern unsigned long initrd_end;
 int initrd_is_mapped = 0;
 extern int initrd_below_start_ok;
 #endif
@@ -152,8 +149,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)
 {
         meminfo_t* mi;
         mi = (meminfo_t*)(tag->data);
-        initrd_start = __va(mi->start);
-        initrd_end = __va(mi->end);
+        initrd_start = (unsigned long)__va(mi->start);
+        initrd_end = (unsigned long)__va(mi->end);
 
         return 0;
 }
@@ -170,13 +167,6 @@ static int __init parse_tag_fdt(const bp_tag_t *tag)
 
 __tagtable(BP_TAG_FDT, parse_tag_fdt);
 
-void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
-{
-        initrd_start = (void *)__va(start);
-        initrd_end = (void *)__va(end);
-        initrd_below_start_ok = 1;
-}
-
 #endif /* CONFIG_OF */
 
 #endif /* CONFIG_BLK_DEV_INITRD */
@@ -222,9 +212,13 @@ static int __init parse_bootparam(const bp_tag_t* tag)
 }
 
 #ifdef CONFIG_OF
+bool __initdata dt_memory_scan = false;
 
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
+        if (!dt_memory_scan)
+                return;
+
         size &= PAGE_MASK;
         add_sysmem_bank(MEMORY_TYPE_CONVENTIONAL, base, base + size);
 }
@@ -236,31 +230,13 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
 
 void __init early_init_devtree(void *params)
 {
-        /* Setup flat device-tree pointer */
-        initial_boot_params = params;
-
-        /* Retrieve various informations from the /chosen node of the
-         * device-tree, including the platform type, initrd location and
-         * size, TCE reserve, and more ...
-         */
-        if (!command_line[0])
-                of_scan_flat_dt(early_init_dt_scan_chosen, command_line);
-
-        /* Scan memory nodes and rebuild MEMBLOCKs */
-        of_scan_flat_dt(early_init_dt_scan_root, NULL);
         if (sysmem.nr_banks == 0)
-                of_scan_flat_dt(early_init_dt_scan_memory, NULL);
-}
+                dt_memory_scan = true;
 
-static void __init copy_devtree(void)
-{
-        void *alloc = early_init_dt_alloc_memory_arch(
-                        be32_to_cpu(initial_boot_params->totalsize), 8);
-        if (alloc) {
-                memcpy(alloc, initial_boot_params,
-                                be32_to_cpu(initial_boot_params->totalsize));
-                initial_boot_params = alloc;
-        }
+        early_init_dt_scan(params);
+
+        if (!command_line[0])
+                strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 }
 
 static int __init xtensa_device_probe(void)
@@ -525,10 +501,7 @@ void __init setup_arch(char **cmdline_p)
 
         bootmem_init();
 
-#ifdef CONFIG_OF
-        copy_devtree();
-        unflatten_device_tree();
-#endif
+        unflatten_and_copy_device_tree();
 
         platform_setup(cmdline_p);
 
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 2e391730e8be..523524b68022 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -31,6 +31,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/libata.h>
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 851bd3f43ac6..fb0b40a191c2 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -24,6 +24,8 @@
 #include <scsi/scsi_cmnd.h>
 #include <linux/libata.h>
 #include <asm/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 static unsigned int intr_coalescing_count;
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 0671e45daa57..8fedbc250414 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -21,6 +21,7 @@
 
 #include <linux/kernel.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 #include <linux/fs.h>
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index c6df5b29af08..c66279bb6ef3 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/hw_random.h>
 #include <linux/delay.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/io.h>
 
diff --git a/drivers/char/hw_random/ppc4xx-rng.c b/drivers/char/hw_random/ppc4xx-rng.c
index 732c330805fd..521f76b0934b 100644
--- a/drivers/char/hw_random/ppc4xx-rng.c
+++ b/drivers/char/hw_random/ppc4xx-rng.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/hw_random.h>
 #include <linux/delay.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/io.h>
 
diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-ppc-corenet.c
index e9587073bd32..c4f76ed914b0 100644
--- a/drivers/clk/clk-ppc-corenet.c
+++ b/drivers/clk/clk-ppc-corenet.c
@@ -11,6 +11,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/of.h>
 #include <linux/slab.h>
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
index 534e43a60d1f..f4ec8145b3d1 100644
--- a/drivers/cpufreq/pasemi-cpufreq.c
+++ b/drivers/cpufreq/pasemi-cpufreq.c
@@ -28,6 +28,7 @@
 #include <linux/cpufreq.h>
 #include <linux/timer.h>
 #include <linux/module.h>
+#include <linux/of_address.h>
 
 #include <asm/hw_irq.h>
 #include <asm/io.h>
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index f88e3d8f6b64..efaf6302405f 100644
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -27,6 +27,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 #include <asm/dcr.h>
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index b010d42a1803..bc6d820812b6 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -5,6 +5,9 @@
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
  */
 
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
 #include "compat.h"
 #include "regs.h"
 #include "intern.h"
@@ -224,7 +227,7 @@ static int caam_probe(struct platform_device *pdev)
         topregs = (struct caam_full __iomem *)ctrl;
 
         /* Get the IRQ of the controller (for security violations only) */
-        ctrlpriv->secvio_irq = of_irq_to_resource(nprop, 0, NULL);
+        ctrlpriv->secvio_irq = irq_of_parse_and_map(nprop, 0);
 
         /*
          * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 105ba4da6180..bdb786d5a5e5 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -5,6 +5,8 @@
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
  */
 
+#include <linux/of_irq.h>
+
 #include "compat.h"
 #include "regs.h"
 #include "jr.h"
@@ -403,7 +405,7 @@ int caam_jr_probe(struct platform_device *pdev, struct device_node *np,
                 dma_set_mask(jrdev, DMA_BIT_MASK(32));
 
         /* Identify the interrupt */
-        jrpriv->irq = of_irq_to_resource(np, 0, NULL);
+        jrpriv->irq = irq_of_parse_and_map(np, 0);
 
         /* Now do the platform independent part */
         error = caam_jr_init(jrdev); /* now turn on hardware */
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index 8bdde57f6bb1..e28104b4aab0 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1818,7 +1818,7 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
                 goto err;
         }
 
-        dd->irq = of_irq_to_resource(node, 0, NULL);
+        dd->irq = irq_of_parse_and_map(node, 0);
         if (!dd->irq) {
                 dev_err(dev, "can't translate OF irq value\n");
                 err = -EINVAL;
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 661dc3eb1d66..6cd0e6038583 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -32,6 +32,8 @@
 #include <linux/interrupt.h>
 #include <linux/crypto.h>
 #include <linux/hw_random.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
diff --git a/drivers/dma/bestcomm/sram.c b/drivers/dma/bestcomm/sram.c
index 5e2ed30ba2c4..2074e0e3fa21 100644
--- a/drivers/dma/bestcomm/sram.c
+++ b/drivers/dma/bestcomm/sram.c
@@ -19,6 +19,7 @@
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 
 #include <asm/io.h>
 #include <asm/mmu.h>
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index b3f3e90054f2..61517dd0d0b7 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -33,6 +33,8 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include "dmaengine.h"
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index 2fe435377333..448750da4402 100644
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -39,7 +39,9 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <linux/random.h>
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 370ff8265630..e24b5ef486b5 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -42,6 +42,8 @@
 #include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index c2eaf334b90b..9ee1c76da7b9 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/stop_machine.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
 #include <asm/machdep.h>
 #include <asm/cell-regs.h>
 
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index b350649b9764..914e859e3eda 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -14,6 +14,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/of_irq.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/irq.h>
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b2b8aa9adc0e..3e5ea2c87a6e 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -447,7 +447,7 @@ static int cpm_i2c_setup(struct cpm_i2c *cpm)
 
         init_waitqueue_head(&cpm->i2c_wait);
 
-        cpm->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        cpm->irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         if (!cpm->irq)
                 return -EINVAL;
 
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index ff3caa0c28cd..f7444100f397 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -41,6 +41,8 @@
 #include <asm/irq.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include "i2c-ibm_iic.h"
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index b80c76888cab..b6a741caf4f6 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -17,6 +17,8 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 37e8cfad625b..8c87f4a9793b 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
+#include <linux/of_irq.h>
 #include <asm/prom.h>
 #include <asm/pmac_low_i2c.h>
 
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 4b7662a17ae9..dfbcd872f95e 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -25,6 +25,7 @@
 #include <linux/io.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #define DRIVER_NAME             "xilinx_ps2"
@@ -235,12 +236,12 @@ static void sxps2_close(struct serio *pserio)
  */
 static int xps2_of_probe(struct platform_device *ofdev)
 {
-        struct resource r_irq; /* Interrupt resources */
         struct resource r_mem; /* IO mem resources */
         struct xps2data *drvdata;
         struct serio *serio;
         struct device *dev = &ofdev->dev;
         resource_size_t remap_size, phys_addr;
+        unsigned int irq;
         int error;
 
         dev_info(dev, "Device Tree Probing \'%s\'\n",
@@ -254,7 +255,8 @@ static int xps2_of_probe(struct platform_device *ofdev)
         }
 
         /* Get IRQ for the device */
-        if (!of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq)) {
+        irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
+        if (!irq) {
                 dev_err(dev, "no IRQ found\n");
                 return -ENODEV;
         }
@@ -267,7 +269,7 @@ static int xps2_of_probe(struct platform_device *ofdev)
         }
 
         spin_lock_init(&drvdata->lock);
-        drvdata->irq = r_irq.start;
+        drvdata->irq = irq;
         drvdata->serio = serio;
         drvdata->dev = dev;
 
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index ac5c87939860..4f12c6f01fe7 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -24,6 +24,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #include <asm/machdep.h>
 #include <asm/macio.h>
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index cad0e19b47a2..4192901cab40 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -25,6 +25,8 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/kernel_stat.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index b3b2d36c009e..23b4a3b28dbc 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -35,6 +35,7 @@
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 283e1b53c6be..dee88e59f0d3 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -46,6 +46,8 @@
 #include <linux/suspend.h>
 #include <linux/cpu.h>
 #include <linux/compat.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index fe9898ca3c84..6a232239ee8c 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -21,6 +21,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index c6bd7e84de24..7be89832db19 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -10,6 +10,8 @@
  */
 
 #include <linux/dma-mapping.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/completion.h>
 #include <linux/miscdevice.h>
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 7b56563f8b74..08b18f3f5264 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -88,6 +88,8 @@
  * interrupt source to the GPIO pin. Tada, we hid the interrupt. :)
  */
 
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
 #include <linux/miscdevice.h>
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 20657209a472..e59c8860f472 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -28,6 +28,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 317a771f1587..2730c78d2bf8 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 04e07252d74b..4d203e84e8ca 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -18,6 +18,7 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 3c60a000b426..439bc3896418 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -36,7 +36,9 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/mpc5121.h>
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 8e148f1478fd..69eaba690a99 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -30,6 +30,7 @@
 #include <linux/mtd/ndfc.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <asm/io.h>
 
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 5a67082c07ee..4d174366a0f0 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -28,6 +28,8 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand_ecc.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pci.h>
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 09dde7d27178..49bd9155cb19 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -15,6 +15,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 6aa737a24393..ab506d6cab37 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -34,10 +34,7 @@
 #include <linux/io.h>
 #include <linux/can/dev.h>
 #include <linux/spinlock.h>
-
 #include <linux/of_platform.h>
-#include <asm/prom.h>
-
 #include <linux/of_irq.h>
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index 31ad33911167..047accd4ede5 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -44,7 +44,6 @@
 #include <linux/of_platform.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <asm/prom.h>
 
 #include "sja1000.h"
 
diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c
index 9e1601487263..d0878526c0c8 100644
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@ -628,12 +628,12 @@ static const struct net_device_ops arc_emac_netdev_ops = {
 
 static int arc_emac_probe(struct platform_device *pdev)
 {
-        struct resource res_regs, res_irq;
+        struct resource res_regs;
         struct device_node *phy_node;
         struct arc_emac_priv *priv;
         struct net_device *ndev;
         const char *mac_addr;
-        unsigned int id, clock_frequency;
+        unsigned int id, clock_frequency, irq;
         int err;
 
         if (!pdev->dev.of_node)
@@ -661,8 +661,8 @@ static int arc_emac_probe(struct platform_device *pdev)
         }
 
         /* Get IRQ from device tree */
-        err = of_irq_to_resource(pdev->dev.of_node, 0, &res_irq);
-        if (!err) {
+        irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
+        if (!irq) {
                 dev_err(&pdev->dev, "failed to retrieve <irq> value from device tree\n");
                 return -ENODEV;
         }
@@ -711,7 +711,7 @@ static int arc_emac_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        ndev->irq = res_irq.start;
+        ndev->irq = irq;
         dev_info(&pdev->dev, "IRQ is %d\n", ndev->irq);
 
         /* Register interrupt handler for device */
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
index 7583a9572bcc..f8b92864fc52 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
@@ -32,7 +32,9 @@
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/gfp.h>
 
 #include <asm/immap_cpm2.h>
@@ -88,7 +90,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
         struct fs_platform_info *fpi = fep->fpi;
         int ret = -EINVAL;
 
-        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         if (fep->interrupt == NO_IRQ)
                 goto out;
 
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
index 9ae6cdbcac2e..a9a00f39521a 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
@@ -31,7 +31,9 @@
 #include <linux/bitops.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/gfp.h>
 
 #include <asm/irq.h>
@@ -98,7 +100,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
         struct platform_device *ofdev = to_platform_device(fep->dev);
 
-        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         if (fep->interrupt == NO_IRQ)
                 return -EINVAL;
 
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
index 22a02a767069..d37cd4ebac65 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
@@ -31,6 +31,8 @@
 #include <linux/bitops.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/irq.h>
@@ -98,7 +100,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
         struct platform_device *ofdev = to_platform_device(fep->dev);
 
-        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         if (fep->interrupt == NO_IRQ)
                 return -EINVAL;
 
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index 844ecfa84d17..67caaacd19ec 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -22,6 +22,7 @@
 #include <linux/mii.h>
 #include <linux/platform_device.h>
 #include <linux/mdio-bitbang.h>
+#include <linux/of_address.h>
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index 2f1c46a12f05..ac5d447ff8c4 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -31,6 +31,7 @@
 #include <linux/ethtool.h>
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 
 #include <asm/pgtable.h>
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 9fbe4dda7a0e..ef95c3ae53e6 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -78,6 +78,8 @@
 #include <linux/if_vlan.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 #include <linux/ip.h>
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 5930c39672db..64b329fecf3d 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -31,6 +31,8 @@
 #include <linux/mii.h>
 #include <linux/phy.h>
 #include <linux/workqueue.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_mdio.h>
 #include <linux/of_net.h>
 #include <linux/of_platform.h>
diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c
index c1b6e7e31aac..d449fcb90199 100644
--- a/drivers/net/ethernet/freescale/xgmac_mdio.c
+++ b/drivers/net/ethernet/freescale/xgmac_mdio.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/phy.h>
 #include <linux/mdio.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/of_mdio.h>
 
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 6b5c7222342c..cdf2321f1f0f 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -39,6 +39,8 @@
 #include <linux/bitops.h>
 #include <linux/workqueue.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_net.h>
 #include <linux/slab.h>
 
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index e7847510eda2..9d75fef6396f 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -27,6 +27,7 @@
 
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/of_irq.h>
 
 #include "core.h"
 #include <asm/dcr-regs.h>
diff --git a/drivers/net/ethernet/ibm/emac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c
index c47e23d6eeaa..4fb2f96da23b 100644
--- a/drivers/net/ethernet/ibm/emac/rgmii.c
+++ b/drivers/net/ethernet/ibm/emac/rgmii.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
+#include <linux/of_address.h>
 #include <asm/io.h>
 
 #include "emac.h"
diff --git a/drivers/net/ethernet/ibm/emac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
index c231a4a32c4d..9f24769ed826 100644
--- a/drivers/net/ethernet/ibm/emac/tah.c
+++ b/drivers/net/ethernet/ibm/emac/tah.c
@@ -18,6 +18,7 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
+#include <linux/of_address.h>
 #include <asm/io.h>
 
 #include "emac.h"
diff --git a/drivers/net/ethernet/ibm/emac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c
index 4cdf286f7ee3..9ca67a38c062 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.c
+++ b/drivers/net/ethernet/ibm/emac/zmii.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
+#include <linux/of_address.h>
 #include <asm/io.h>
 
 #include "emac.h"
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 0029148077a9..1f2364126323 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -36,6 +36,7 @@
 #include <linux/netdevice.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_mdio.h>
 #include <linux/of_platform.h>
 #include <linux/of_address.h>
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 78cc76053328..de6f8990246f 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -17,6 +17,7 @@ config PROC_DEVICETREE
 
 config OF_SELFTEST
         bool "Device Tree Runtime self tests"
+        depends on OF_IRQ
         help
           This option builds in test cases for the device tree infrastructure
           that are executed one at boot time, and the results dumped to the
diff --git a/drivers/of/address.c b/drivers/of/address.c
index b55c21890760..4b9317bdb81c 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -489,7 +489,7 @@ static u64 __of_translate_address(struct device_node *dev,
         int na, ns, pna, pns;
         u64 result = OF_BAD_ADDR;
 
-        pr_debug("OF: ** translation for device %s **\n", dev->full_name);
+        pr_debug("OF: ** translation for device %s **\n", of_node_full_name(dev));
 
         /* Increase refcount at current level */
         of_node_get(dev);
@@ -504,13 +504,13 @@ static u64 __of_translate_address(struct device_node *dev,
         bus->count_cells(dev, &na, &ns);
         if (!OF_CHECK_COUNTS(na, ns)) {
                 printk(KERN_ERR "prom_parse: Bad cell count for %s\n",
-                       dev->full_name);
+                       of_node_full_name(dev));
                 goto bail;
         }
         memcpy(addr, in_addr, na * 4);
 
         pr_debug("OF: bus is %s (na=%d, ns=%d) on %s\n",
-            bus->name, na, ns, parent->full_name);
+            bus->name, na, ns, of_node_full_name(parent));
         of_dump_addr("OF: translating address:", addr, na);
 
         /* Translate */
@@ -532,12 +532,12 @@ static u64 __of_translate_address(struct device_node *dev,
                 pbus->count_cells(dev, &pna, &pns);
                 if (!OF_CHECK_COUNTS(pna, pns)) {
                         printk(KERN_ERR "prom_parse: Bad cell count for %s\n",
-                               dev->full_name);
+                               of_node_full_name(dev));
                         break;
                 }
 
                 pr_debug("OF: parent bus is %s (na=%d, ns=%d) on %s\n",
-                    pbus->name, pna, pns, parent->full_name);
+                    pbus->name, pna, pns, of_node_full_name(parent));
 
                 /* Apply bus translation */
                 if (of_translate_one(dev, bus, pbus, addr, na, ns, pna, rprop))
@@ -626,6 +626,14 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size,
 }
 EXPORT_SYMBOL(of_get_address);
 
+unsigned long __weak pci_address_to_pio(phys_addr_t address)
+{
+        if (address > IO_SPACE_LIMIT)
+                return (unsigned long)-1;
+
+        return (unsigned long) address;
+}
+
 static int __of_address_to_resource(struct device_node *dev,
                 const __be32 *addrp, u64 size, unsigned int flags,
                 const char *name, struct resource *r)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index aace017fc452..f807d0edabf3 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -74,6 +74,13 @@ int of_n_size_cells(struct device_node *np)
 }
 EXPORT_SYMBOL(of_n_size_cells);
 
+#ifdef CONFIG_NUMA
+int __weak of_node_to_nid(struct device_node *np)
+{
+        return numa_node_id();
+}
+#endif
+
 #if defined(CONFIG_OF_DYNAMIC)
 /**
  *      of_node_get - Increment refcount of a node
@@ -265,9 +272,9 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
 
         ac = of_n_addr_cells(cpun);
         cell = of_get_property(cpun, prop_name, &prop_len);
-        if (!cell)
+        if (!cell || !ac)
                 return false;
-        prop_len /= sizeof(*cell);
+        prop_len /= sizeof(*cell) * ac;
         for (tid = 0; tid < prop_len; tid++) {
                 hwid = of_read_number(cell, ac);
                 if (arch_match_cpu_phys_id(cpu, hwid)) {
@@ -280,6 +287,31 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
         return false;
 }
 
+/*
+ * arch_find_n_match_cpu_physical_id - See if the given device node is
+ * for the cpu corresponding to logical cpu 'cpu'.  Return true if so,
+ * else false.  If 'thread' is non-NULL, the local thread number within the
+ * core is returned in it.
+ */
+bool __weak arch_find_n_match_cpu_physical_id(struct device_node *cpun,
+                                              int cpu, unsigned int *thread)
+{
+        /* Check for non-standard "ibm,ppc-interrupt-server#s" property
+         * for thread ids on PowerPC. If it doesn't exist fallback to
+         * standard "reg" property.
+         */
+        if (IS_ENABLED(CONFIG_PPC) &&
+            __of_find_n_match_cpu_property(cpun,
+                                           "ibm,ppc-interrupt-server#s",
+                                           cpu, thread))
+                return true;
+
+        if (__of_find_n_match_cpu_property(cpun, "reg", cpu, thread))
+                return true;
+
+        return false;
+}
+
 /**
  * of_get_cpu_node - Get device node associated with the given logical CPU
  *
@@ -300,24 +332,10 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
  */
 struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
-        struct device_node *cpun, *cpus;
-
-        cpus = of_find_node_by_path("/cpus");
-        if (!cpus)
-                return NULL;
+        struct device_node *cpun;
 
-        for_each_child_of_node(cpus, cpun) {
-                if (of_node_cmp(cpun->type, "cpu"))
-                        continue;
-                /* Check for non-standard "ibm,ppc-interrupt-server#s" property
-                 * for thread ids on PowerPC. If it doesn't exist fallback to
-                 * standard "reg" property.
-                 */
-                if (IS_ENABLED(CONFIG_PPC) &&
-                        __of_find_n_match_cpu_property(cpun,
-                                "ibm,ppc-interrupt-server#s", cpu, thread))
-                        return cpun;
-                if (__of_find_n_match_cpu_property(cpun, "reg", cpu, thread))
+        for_each_node_by_type(cpun, "cpu") {
+                if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
                         return cpun;
         }
         return NULL;
@@ -1174,6 +1192,15 @@ int of_property_count_strings(struct device_node *np, const char *propname)
 }
 EXPORT_SYMBOL_GPL(of_property_count_strings);
 
+void of_print_phandle_args(const char *msg, const struct of_phandle_args *args)
+{
+        int i;
+        printk("%s %s", msg, of_node_full_name(args->np));
+        for (i = 0; i < args->args_count; i++)
+                printk(i ? ",%08x" : ":%08x", args->args[i]);
+        printk("\n");
+}
+
 static int __of_parse_phandle_with_args(const struct device_node *np,
                                         const char *list_name,
                                         const char *cells_name,
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index a4fa9ad31b8f..2fa024b97c43 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -618,12 +618,72 @@ int __init of_scan_flat_dt_by_path(const char *path,
                 return ret;
 }
 
+const char * __init of_flat_dt_get_machine_name(void)
+{
+        const char *name;
+        unsigned long dt_root = of_get_flat_dt_root();
+
+        name = of_get_flat_dt_prop(dt_root, "model", NULL);
+        if (!name)
+                name = of_get_flat_dt_prop(dt_root, "compatible", NULL);
+        return name;
+}
+
+/**
+ * of_flat_dt_match_machine - Iterate match tables to find matching machine.
+ *
+ * @default_match: A machine specific ptr to return in case of no match.
+ * @get_next_compat: callback function to return next compatible match table.
+ *
+ * Iterate through machine match tables to find the best match for the machine
+ * compatible string in the FDT.
+ */
+const void * __init of_flat_dt_match_machine(const void *default_match,
+                const void * (*get_next_compat)(const char * const**))
+{
+        const void *data = NULL;
+        const void *best_data = default_match;
+        const char *const *compat;
+        unsigned long dt_root;
+        unsigned int best_score = ~1, score = 0;
+
+        dt_root = of_get_flat_dt_root();
+        while ((data = get_next_compat(&compat))) {
+                score = of_flat_dt_match(dt_root, compat);
+                if (score > 0 && score < best_score) {
+                        best_data = data;
+                        best_score = score;
+                }
+        }
+        if (!best_data) {
+                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");
+                return NULL;
+        }
+
+        pr_info("Machine model: %s\n", of_flat_dt_get_machine_name());
+
+        return best_data;
+}
+
 #ifdef CONFIG_BLK_DEV_INITRD
 /**
  * early_init_dt_check_for_initrd - Decode initrd location from flat tree
  * @node: reference to node containing initrd location ('chosen')
  */
-void __init early_init_dt_check_for_initrd(unsigned long node)
+static void __init early_init_dt_check_for_initrd(unsigned long node)
 {
         u64 start, end;
         unsigned long len;
@@ -641,12 +701,15 @@ void __init early_init_dt_check_for_initrd(unsigned long node)
                 return;
         end = of_read_number(prop, len/4);
 
-        early_init_dt_setup_initrd_arch(start, end);
+        initrd_start = (unsigned long)__va(start);
+        initrd_end = (unsigned long)__va(end);
+        initrd_below_start_ok = 1;
+
         pr_debug("initrd_start=0x%llx  initrd_end=0x%llx\n",
                  (unsigned long long)start, (unsigned long long)end);
 }
 #else
-inline void early_init_dt_check_for_initrd(unsigned long node)
+static inline void early_init_dt_check_for_initrd(unsigned long node)
 {
 }
 #endif /* CONFIG_BLK_DEV_INITRD */
@@ -774,6 +837,25 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
 }
 
 #ifdef CONFIG_HAVE_MEMBLOCK
+void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
+{
+        const u64 phys_offset = __pa(PAGE_OFFSET);
+        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);
+}
+
 /*
  * called from unflatten_device_tree() to bootstrap devicetree itself
  * Architectures can override this definition if memblock isn't used
@@ -784,6 +866,32 @@ void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align)
 }
 #endif
 
+bool __init early_init_dt_scan(void *params)
+{
+        if (!params)
+                return false;
+
+        /* Setup flat device-tree pointer */
+        initial_boot_params = params;
+
+        /* check device tree validity */
+        if (be32_to_cpu(initial_boot_params->magic) != OF_DT_HEADER) {
+                initial_boot_params = NULL;
+                return false;
+        }
+
+        /* 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);
+
+        return true;
+}
+
 /**
  * unflatten_device_tree - create tree of device_nodes from flat blob
  *
@@ -801,4 +909,28 @@ void __init unflatten_device_tree(void)
         of_alias_scan(early_init_dt_alloc_memory_arch);
 }
 
+/**
+ * unflatten_and_copy_device_tree - copy and create tree of device_nodes from flat blob
+ *
+ * Copies and unflattens the device-tree passed by the firmware, creating the
+ * tree of struct device_node. It also fills the "name" and "type"
+ * pointers of the nodes so the normal device-tree walking functions
+ * can be used. This should only be used when the FDT memory has not been
+ * reserved such is the case when the FDT is built-in to the kernel init
+ * section. If the FDT memory is reserved already then unflatten_device_tree
+ * should be used instead.
+ */
+void __init unflatten_and_copy_device_tree(void)
+{
+        int size = __be32_to_cpu(initial_boot_params->totalsize);
+        void *dt = early_init_dt_alloc_memory_arch(size,
+                __alignof__(struct boot_param_header));
+
+        if (dt) {
+                memcpy(dt, initial_boot_params, size);
+                initial_boot_params = dt;
+        }
+        unflatten_device_tree();
+}
+
 #endif /* CONFIG_OF_EARLY_FLATTREE */
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 1752988d6aa8..786b0b47fae4 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -31,18 +31,17 @@
  * @dev: Device node of the device whose interrupt is to be mapped
  * @index: Index of the interrupt to map
  *
- * This function is a wrapper that chains of_irq_map_one() and
+ * This function is a wrapper that chains of_irq_parse_one() and
  * irq_create_of_mapping() to make things easier to callers
  */
 unsigned int irq_of_parse_and_map(struct device_node *dev, int index)
 {
-        struct of_irq oirq;
+        struct of_phandle_args oirq;
 
-        if (of_irq_map_one(dev, index, &oirq))
+        if (of_irq_parse_one(dev, index, &oirq))
                 return 0;
 
-        return irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                     oirq.size);
+        return irq_create_of_mapping(&oirq);
 }
 EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
 
@@ -79,33 +78,34 @@ struct device_node *of_irq_find_parent(struct device_node *child)
 }
 
 /**
- * of_irq_map_raw - Low level interrupt tree parsing
+ * of_irq_parse_raw - Low level interrupt tree parsing
  * @parent:     the device interrupt parent
- * @intspec:    interrupt specifier ("interrupts" property of the device)
- * @ointsize:   size of the passed in interrupt specifier
- * @addr:       address specifier (start of "reg" property of the device)
- * @out_irq:    structure of_irq filled by this function
+ * @addr:       address specifier (start of "reg" property of the device) in be32 format
+ * @out_irq:    structure of_irq updated by this function
  *
  * Returns 0 on success and a negative number on error
  *
  * This function is a low-level interrupt tree walking function. It
  * can be used to do a partial walk with synthetized reg and interrupts
  * properties, for example when resolving PCI interrupts when no device
- * node exist for the parent.
+ * node exist for the parent. It takes an interrupt specifier structure as
+ * input, walks the tree looking for any interrupt-map properties, translates
+ * the specifier for each map, and then returns the translated map.
  */
-int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
-                   u32 ointsize, const __be32 *addr, struct of_irq *out_irq)
+int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
 {
         struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL;
-        const __be32 *tmp, *imap, *imask;
+        __be32 initial_match_array[MAX_PHANDLE_ARGS];
+        const __be32 *match_array = initial_match_array;
+        const __be32 *tmp, *imap, *imask, dummy_imask[] = { [0 ... MAX_PHANDLE_ARGS] = ~0 };
         u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;
         int imaplen, match, i;
 
-        pr_debug("of_irq_map_raw: par=%s,intspec=[0x%08x 0x%08x...],ointsize=%d\n",
-                 parent->full_name, be32_to_cpup(intspec),
-                 be32_to_cpup(intspec + 1), ointsize);
+#ifdef DEBUG
+        of_print_phandle_args("of_irq_parse_raw: ", out_irq);
+#endif
 
-        ipar = of_node_get(parent);
+        ipar = of_node_get(out_irq->np);
 
         /* First get the #interrupt-cells property of the current cursor
          * that tells us how to interpret the passed-in intspec. If there
@@ -126,9 +126,9 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
                 goto fail;
         }
 
-        pr_debug("of_irq_map_raw: ipar=%s, size=%d\n", ipar->full_name, intsize);
+        pr_debug("of_irq_parse_raw: ipar=%s, size=%d\n", of_node_full_name(ipar), intsize);
 
-        if (ointsize != intsize)
+        if (out_irq->args_count != intsize)
                 return -EINVAL;
 
         /* Look for this #address-cells. We have to implement the old linux
@@ -147,6 +147,16 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
 
         pr_debug(" -> addrsize=%d\n", addrsize);
 
+        /* Range check so that the temporary buffer doesn't overflow */
+        if (WARN_ON(addrsize + intsize > MAX_PHANDLE_ARGS))
+                goto fail;
+
+        /* Precalculate the match array - this simplifies match loop */
+        for (i = 0; i < addrsize; i++)
+                initial_match_array[i] = addr ? addr[i] : 0;
+        for (i = 0; i < intsize; i++)
+                initial_match_array[addrsize + i] = cpu_to_be32(out_irq->args[i]);
+
         /* Now start the actual "proper" walk of the interrupt tree */
         while (ipar != NULL) {
                 /* Now check if cursor is an interrupt-controller and if it is
@@ -155,15 +165,19 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
                 if (of_get_property(ipar, "interrupt-controller", NULL) !=
                                 NULL) {
                         pr_debug(" -> got it !\n");
-                        for (i = 0; i < intsize; i++)
-                                out_irq->specifier[i] =
-                                                of_read_number(intspec +i, 1);
-                        out_irq->size = intsize;
-                        out_irq->controller = ipar;
                         of_node_put(old);
                         return 0;
                 }
 
+                /*
+                 * interrupt-map parsing does not work without a reg
+                 * property when #address-cells != 0
+                 */
+                if (addrsize && !addr) {
+                        pr_debug(" -> no reg passed in when needed !\n");
+                        goto fail;
+                }
+
                 /* Now look for an interrupt-map */
                 imap = of_get_property(ipar, "interrupt-map", &imaplen);
                 /* No interrupt map, check for an interrupt parent */
@@ -176,34 +190,16 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
 
                 /* Look for a mask */
                 imask = of_get_property(ipar, "interrupt-map-mask", NULL);
-
-                /* If we were passed no "reg" property and we attempt to parse
-                 * an interrupt-map, then #address-cells must be 0.
-                 * Fail if it's not.
-                 */
-                if (addr == NULL && addrsize != 0) {
-                        pr_debug(" -> no reg passed in when needed !\n");
-                        goto fail;
-                }
+                if (!imask)
+                        imask = dummy_imask;
 
                 /* Parse interrupt-map */
                 match = 0;
                 while (imaplen > (addrsize + intsize + 1) && !match) {
                         /* Compare specifiers */
                         match = 1;
-                        for (i = 0; i < addrsize && match; ++i) {
-                                __be32 mask = imask ? imask[i]
-                                                    : cpu_to_be32(0xffffffffu);
-                                match = ((addr[i] ^ imap[i]) & mask) == 0;
-                        }
-                        for (; i < (addrsize + intsize) && match; ++i) {
-                                __be32 mask = imask ? imask[i]
-                                                    : cpu_to_be32(0xffffffffu);
-                                match =
-                                   ((intspec[i-addrsize] ^ imap[i]) & mask) == 0;
-                        }
-                        imap += addrsize + intsize;
-                        imaplen -= addrsize + intsize;
+                        for (i = 0; i < (addrsize + intsize); i++, imaplen--)
+                                match &= !((match_array[i] ^ *imap++) & imask[i]);
 
                         pr_debug(" -> match=%d (imaplen=%d)\n", match, imaplen);
 
@@ -237,6 +233,8 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
                             newintsize, newaddrsize);
 
                         /* Check for malformed properties */
+                        if (WARN_ON(newaddrsize + newintsize > MAX_PHANDLE_ARGS))
+                                goto fail;
                         if (imaplen < (newaddrsize + newintsize))
                                 goto fail;
 
@@ -248,12 +246,18 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
                 if (!match)
                         goto fail;
 
-                of_node_put(old);
-                old = of_node_get(newpar);
+                /*
+                 * Successfully parsed an interrrupt-map translation; copy new
+                 * interrupt specifier into the out_irq structure
+                 */
+                of_node_put(out_irq->np);
+                out_irq->np = of_node_get(newpar);
+
+                match_array = imap - newaddrsize - newintsize;
+                for (i = 0; i < newintsize; i++)
+                        out_irq->args[i] = be32_to_cpup(imap - newintsize + i);
+                out_irq->args_count = intsize = newintsize;
                 addrsize = newaddrsize;
-                intsize = newintsize;
-                intspec = imap - intsize;
-                addr = intspec - addrsize;
 
         skiplevel:
                 /* Iterate again with new parent */
@@ -264,46 +268,53 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
         }
  fail:
         of_node_put(ipar);
-        of_node_put(old);
+        of_node_put(out_irq->np);
         of_node_put(newpar);
 
         return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(of_irq_map_raw);
+EXPORT_SYMBOL_GPL(of_irq_parse_raw);
 
 /**
- * of_irq_map_one - Resolve an interrupt for a device
+ * of_irq_parse_one - Resolve an interrupt for a device
  * @device: the device whose interrupt is to be resolved
  * @index: index of the interrupt to resolve
  * @out_irq: structure of_irq filled by this function
  *
- * This function resolves an interrupt, walking the tree, for a given
- * device-tree node. It's the high level pendant to of_irq_map_raw().
+ * This function resolves an interrupt for a node by walking the interrupt tree,
+ * finding which interrupt controller node it is attached to, and returning the
+ * interrupt specifier that can be used to retrieve a Linux IRQ number.
  */
-int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq)
+int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_args *out_irq)
 {
         struct device_node *p;
         const __be32 *intspec, *tmp, *addr;
         u32 intsize, intlen;
-        int res = -EINVAL;
+        int i, res = -EINVAL;
 
-        pr_debug("of_irq_map_one: dev=%s, index=%d\n", device->full_name, index);
+        pr_debug("of_irq_parse_one: dev=%s, index=%d\n", of_node_full_name(device), index);
 
         /* OldWorld mac stuff is "special", handle out of line */
         if (of_irq_workarounds & OF_IMAP_OLDWORLD_MAC)
-                return of_irq_map_oldworld(device, index, out_irq);
+                return of_irq_parse_oldworld(device, index, out_irq);
+
+        /* Get the reg property (if any) */
+        addr = of_get_property(device, "reg", NULL);
 
         /* Get the interrupts property */
         intspec = of_get_property(device, "interrupts", &intlen);
-        if (intspec == NULL)
-                return -EINVAL;
+        if (intspec == NULL) {
+                /* Try the new-style interrupts-extended */
+                res = of_parse_phandle_with_args(device, "interrupts-extended",
+                                                "#interrupt-cells", index, out_irq);
+                if (res)
+                        return -EINVAL;
+                return of_irq_parse_raw(addr, out_irq);
+        }
         intlen /= sizeof(*intspec);
 
         pr_debug(" intspec=%d intlen=%d\n", be32_to_cpup(intspec), intlen);
 
-        /* Get the reg property (if any) */
-        addr = of_get_property(device, "reg", NULL);
-
         /* Look for the interrupt parent. */
         p = of_irq_find_parent(device);
         if (p == NULL)
@@ -321,14 +332,20 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq
         if ((index + 1) * intsize > intlen)
                 goto out;
 
-        /* Get new specifier and map it */
-        res = of_irq_map_raw(p, intspec + index * intsize, intsize,
-                             addr, out_irq);
+        /* Copy intspec into irq structure */
+        intspec += index * intsize;
+        out_irq->np = p;
+        out_irq->args_count = intsize;
+        for (i = 0; i < intsize; i++)
+                out_irq->args[i] = be32_to_cpup(intspec++);
+
+        /* Check if there are any interrupt-map translations to process */
+        res = of_irq_parse_raw(addr, out_irq);
  out:
         of_node_put(p);
         return res;
 }
-EXPORT_SYMBOL_GPL(of_irq_map_one);
+EXPORT_SYMBOL_GPL(of_irq_parse_one);
 
 /**
  * of_irq_to_resource - Decode a node's IRQ and return it as a resource
@@ -354,8 +371,8 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
                                               &name);
 
                 r->start = r->end = irq;
-                r->flags = IORESOURCE_IRQ;
-                r->name = name ? name : dev->full_name;
+                r->flags = IORESOURCE_IRQ | irqd_get_trigger_type(irq_get_irq_data(irq));
+                r->name = name ? name : of_node_full_name(dev);
         }
 
         return irq;
@@ -368,9 +385,10 @@ EXPORT_SYMBOL_GPL(of_irq_to_resource);
  */
 int of_irq_count(struct device_node *dev)
 {
+        struct of_phandle_args irq;
         int nr = 0;
 
-        while (of_irq_to_resource(dev, nr, NULL))
+        while (of_irq_parse_one(dev, nr, &irq) == 0)
                 nr++;
 
         return nr;
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index e5ca00893c0c..848199633798 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -2,7 +2,6 @@
 #include <linux/export.h>
 #include <linux/of.h>
 #include <linux/of_pci.h>
-#include <asm/prom.h>
 
 static inline int __of_pci_pci_compare(struct device_node *node,
                                        unsigned int data)
diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c
index 677053813211..8736bc7676c5 100644
--- a/drivers/of/of_pci_irq.c
+++ b/drivers/of/of_pci_irq.c
@@ -2,10 +2,9 @@
 #include <linux/of_pci.h>
 #include <linux/of_irq.h>
 #include <linux/export.h>
-#include <asm/prom.h>
 
 /**
- * of_irq_map_pci - Resolve the interrupt for a PCI device
+ * of_irq_parse_pci - Resolve the interrupt for a PCI device
  * @pdev:       the device whose interrupt is to be resolved
  * @out_irq:    structure of_irq filled by this function
  *
@@ -15,7 +14,7 @@
  * PCI tree until an device-node is found, at which point it will finish
  * resolving using the OF tree walking.
  */
-int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq)
+int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
 {
         struct device_node *dn, *ppnode;
         struct pci_dev *ppdev;
@@ -30,7 +29,7 @@ int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq)
          */
         dn = pci_device_to_OF_node(pdev);
         if (dn) {
-                rc = of_irq_map_one(dn, 0, out_irq);
+                rc = of_irq_parse_one(dn, 0, out_irq);
                 if (!rc)
                         return rc;
         }
@@ -85,9 +84,37 @@ int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq)
                 pdev = ppdev;
         }
 
+        out_irq->np = ppnode;
+        out_irq->args_count = 1;
+        out_irq->args[0] = lspec;
         lspec_be = cpu_to_be32(lspec);
         laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8));
-        laddr[1]  = laddr[2] = cpu_to_be32(0);
-        return of_irq_map_raw(ppnode, &lspec_be, 1, laddr, out_irq);
+        laddr[1] = laddr[2] = cpu_to_be32(0);
+        return of_irq_parse_raw(laddr, out_irq);
 }
-EXPORT_SYMBOL_GPL(of_irq_map_pci);
+EXPORT_SYMBOL_GPL(of_irq_parse_pci);
+
+/**
+ * of_irq_parse_and_map_pci() - Decode a PCI irq from the device tree and map to a virq
+ * @dev: The pci device needing an irq
+ * @slot: PCI slot number; passed when used as map_irq callback. Unused
+ * @pin: PCI irq pin number; passed when used as map_irq callback. Unused
+ *
+ * @slot and @pin are unused, but included in the function so that this
+ * function can be used directly as the map_irq callback to pci_fixup_irqs().
+ */
+int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        struct of_phandle_args oirq;
+        int ret;
+
+        ret = of_irq_parse_pci(dev, &oirq);
+        if (ret) {
+                dev_err(&dev->dev, "of_irq_parse_pci() failed with rc=%d\n", ret);
+                return 0; /* Proper return code 0 == NO_IRQ */
+        }
+
+        return irq_create_of_mapping(&oirq);
+}
+EXPORT_SYMBOL_GPL(of_irq_parse_and_map_pci);
+
diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c
index 4ec19cbee57f..7b666736c168 100644
--- a/drivers/of/pdt.c
+++ b/drivers/of/pdt.c
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_pdt.h>
-#include <asm/prom.h>
 
 static struct of_pdt_ops *of_pdt_prom_ops __initdata;
 
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index f6dcde220821..fce088e6f54e 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -215,6 +215,8 @@ static struct platform_device *of_platform_device_create_pdata(
         dev->archdata.dma_mask = 0xffffffffUL;
 #endif
         dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        if (!dev->dev.dma_mask)
+                dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
         dev->dev.bus = &platform_bus_type;
         dev->dev.platform_data = platform_data;
 
diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c
index 0eb5c38b4e07..e21012bde639 100644
--- a/drivers/of/selftest.c
+++ b/drivers/of/selftest.c
@@ -9,18 +9,24 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_irq.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/device.h>
 
-static bool selftest_passed = true;
+static struct selftest_results {
+        int passed;
+        int failed;
+} selftest_results;
+
 #define selftest(result, fmt, ...) { \
         if (!(result)) { \
-                pr_err("FAIL %s:%i " fmt, __FILE__, __LINE__, ##__VA_ARGS__); \
-                selftest_passed = false; \
+                selftest_results.failed++; \
+                pr_err("FAIL %s():%i " fmt, __func__, __LINE__, ##__VA_ARGS__); \
         } else { \
-                pr_info("pass %s:%i\n", __FILE__, __LINE__); \
+                selftest_results.passed++; \
+                pr_debug("pass %s():%i\n", __func__, __LINE__); \
         } \
 }
 
@@ -131,7 +137,6 @@ static void __init of_selftest_property_match_string(void)
         struct device_node *np;
         int rc;
 
-        pr_info("start\n");
         np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");
         if (!np) {
                 pr_err("No testcase data in device tree\n");
@@ -154,6 +159,147 @@ static void __init of_selftest_property_match_string(void)
         selftest(rc == -EILSEQ, "unterminated string; rc=%i", rc);
 }
 
+static void __init of_selftest_parse_interrupts(void)
+{
+        struct device_node *np;
+        struct of_phandle_args args;
+        int i, rc;
+
+        np = of_find_node_by_path("/testcase-data/interrupts/interrupts0");
+        if (!np) {
+                pr_err("missing testcase data\n");
+                return;
+        }
+
+        for (i = 0; i < 4; i++) {
+                bool passed = true;
+                args.args_count = 0;
+                rc = of_irq_parse_one(np, i, &args);
+
+                passed &= !rc;
+                passed &= (args.args_count == 1);
+                passed &= (args.args[0] == (i + 1));
+
+                selftest(passed, "index %i - data error on node %s rc=%i\n",
+                         i, args.np->full_name, rc);
+        }
+        of_node_put(np);
+
+        np = of_find_node_by_path("/testcase-data/interrupts/interrupts1");
+        if (!np) {
+                pr_err("missing testcase data\n");
+                return;
+        }
+
+        for (i = 0; i < 4; i++) {
+                bool passed = true;
+                args.args_count = 0;
+                rc = of_irq_parse_one(np, i, &args);
+
+                /* Test the values from tests-phandle.dtsi */
+                switch (i) {
+                case 0:
+                        passed &= !rc;
+                        passed &= (args.args_count == 1);
+                        passed &= (args.args[0] == 9);
+                        break;
+                case 1:
+                        passed &= !rc;
+                        passed &= (args.args_count == 3);
+                        passed &= (args.args[0] == 10);
+                        passed &= (args.args[1] == 11);
+                        passed &= (args.args[2] == 12);
+                        break;
+                case 2:
+                        passed &= !rc;
+                        passed &= (args.args_count == 2);
+                        passed &= (args.args[0] == 13);
+                        passed &= (args.args[1] == 14);
+                        break;
+                case 3:
+                        passed &= !rc;
+                        passed &= (args.args_count == 2);
+                        passed &= (args.args[0] == 15);
+                        passed &= (args.args[1] == 16);
+                        break;
+                default:
+                        passed = false;
+                }
+                selftest(passed, "index %i - data error on node %s rc=%i\n",
+                         i, args.np->full_name, rc);
+        }
+        of_node_put(np);
+}
+
+static void __init of_selftest_parse_interrupts_extended(void)
+{
+        struct device_node *np;
+        struct of_phandle_args args;
+        int i, rc;
+
+        np = of_find_node_by_path("/testcase-data/interrupts/interrupts-extended0");
+        if (!np) {
+                pr_err("missing testcase data\n");
+                return;
+        }
+
+        for (i = 0; i < 7; i++) {
+                bool passed = true;
+                rc = of_irq_parse_one(np, i, &args);
+
+                /* Test the values from tests-phandle.dtsi */
+                switch (i) {
+                case 0:
+                        passed &= !rc;
+                        passed &= (args.args_count == 1);
+                        passed &= (args.args[0] == 1);
+                        break;
+                case 1:
+                        passed &= !rc;
+                        passed &= (args.args_count == 3);
+                        passed &= (args.args[0] == 2);
+                        passed &= (args.args[1] == 3);
+                        passed &= (args.args[2] == 4);
+                        break;
+                case 2:
+                        passed &= !rc;
+                        passed &= (args.args_count == 2);
+                        passed &= (args.args[0] == 5);
+                        passed &= (args.args[1] == 6);
+                        break;
+                case 3:
+                        passed &= !rc;
+                        passed &= (args.args_count == 1);
+                        passed &= (args.args[0] == 9);
+                        break;
+                case 4:
+                        passed &= !rc;
+                        passed &= (args.args_count == 3);
+                        passed &= (args.args[0] == 10);
+                        passed &= (args.args[1] == 11);
+                        passed &= (args.args[2] == 12);
+                        break;
+                case 5:
+                        passed &= !rc;
+                        passed &= (args.args_count == 2);
+                        passed &= (args.args[0] == 13);
+                        passed &= (args.args[1] == 14);
+                        break;
+                case 6:
+                        passed &= !rc;
+                        passed &= (args.args_count == 1);
+                        passed &= (args.args[0] == 15);
+                        break;
+                default:
+                        passed = false;
+                }
+
+                selftest(passed, "index %i - data error on node %s rc=%i\n",
+                         i, args.np->full_name, rc);
+        }
+        of_node_put(np);
+}
+
 static int __init of_selftest(void)
 {
         struct device_node *np;
@@ -168,7 +314,10 @@ static int __init of_selftest(void)
         pr_info("start of selftest - you will see error messages\n");
         of_selftest_parse_phandle_with_args();
         of_selftest_property_match_string();
-        pr_info("end of selftest - %s\n", selftest_passed ? "PASS" : "FAIL");
+        of_selftest_parse_interrupts();
+        of_selftest_parse_interrupts_extended();
+        pr_info("end of selftest - %i passed, %i failed\n",
+                selftest_results.passed, selftest_results.failed);
         return 0;
 }
 late_initcall(of_selftest);
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 80b2250ea19a..c269e430c760 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -665,19 +665,6 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
         return 1;
 }
 
-static int mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        struct of_irq oirq;
-        int ret;
-
-        ret = of_irq_map_pci(dev, &oirq);
-        if (ret)
-                return ret;
-
-        return irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                     oirq.size);
-}
-
 static struct pci_bus *mvebu_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 {
         struct mvebu_pcie *pcie = sys_to_pcie(sys);
@@ -732,7 +719,7 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie)
         hw.private_data   = (void **)&pcie;
         hw.setup          = mvebu_pcie_setup;
         hw.scan           = mvebu_pcie_scan_bus;
-        hw.map_irq        = mvebu_pcie_map_irq;
+        hw.map_irq        = of_irq_parse_and_map_pci;
         hw.ops            = &mvebu_pcie_ops;
         hw.align_resource = mvebu_pcie_align_resource;
         hw.add_bus        = mvebu_pcie_add_bus;
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index a007321ad314..1b206eac5f93 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -30,6 +30,8 @@
 #include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
 
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 18c0d8d1ddf7..182034d2ef58 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -48,7 +48,9 @@
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
 #include <linux/bitops.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/io.h>
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index 9c8f60903799..dc4f14255cc3 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/drivers/rtc/rtc-mpc5121.c
@@ -14,7 +14,9 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 #include <linux/slab.h>
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c
index 58630edb8c21..54b06376f03c 100644
--- a/drivers/spi/spi-fsl-cpm.c
+++ b/drivers/spi/spi-fsl-cpm.c
@@ -20,6 +20,7 @@
 #include <linux/spi/spi.h>
 #include <linux/fsl_devices.h>
 #include <linux/dma-mapping.h>
+#include <linux/of_address.h>
 #include <asm/cpm.h>
 #include <asm/qe.h>
 
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 43222d7532d1..32200d4f8780 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -16,6 +16,8 @@
 #include <linux/fsl_devices.h>
 #include <linux/mm.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
@@ -687,7 +689,7 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
         struct device_node *np = ofdev->dev.of_node;
         struct spi_master *master;
         struct resource mem;
-        struct resource irq;
+        unsigned int irq;
         int ret = -ENOMEM;
 
         ret = of_mpc8xxx_spi_probe(ofdev);
@@ -702,13 +704,13 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
         if (ret)
                 goto err;
 
-        ret = of_irq_to_resource(np, 0, &irq);
+        irq = irq_of_parse_and_map(np, 0);
         if (!ret) {
                 ret = -EINVAL;
                 goto err;
         }
 
-        master = fsl_espi_probe(dev, &mem, irq.start);
+        master = fsl_espi_probe(dev, &mem, irq);
         if (IS_ERR(master)) {
                 ret = PTR_ERR(master);
                 goto err;
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index ee6e61cbf7f5..58d5ee0e4443 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/completion.h>
 #include <linux/io.h>
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index c57740bb70d3..5ee56726f8d0 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -29,6 +29,8 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/wait.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/interrupt.h>
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 9bffcec5ad82..0419b69e270f 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -32,6 +32,7 @@
 #include <linux/poll.h>
 #include <asm/epapr_hcalls.h>
 #include <linux/of.h>
+#include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/cdev.h>
 #include <linux/console.h>
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 1a535f70dc41..7d76214612c7 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -41,6 +41,8 @@
 #include <linux/bootmem.h>
 #include <linux/dma-mapping.h>
 #include <linux/fs_uart_pd.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
@@ -1207,7 +1209,7 @@ static int cpm_uart_init_port(struct device_node *np,
         pinfo->port.fifosize = pinfo->tx_nrfifos * pinfo->tx_fifosize;
         spin_lock_init(&pinfo->port.lock);
 
-        pinfo->port.irq = of_irq_to_resource(np, 0, NULL);
+        pinfo->port.irq = irq_of_parse_and_map(np, 0);
         if (pinfo->port.irq == NO_IRQ) {
                 ret = -EINVAL;
                 goto out_pram;
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
index 18f79575894a..527a969b0952 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
@@ -45,6 +45,7 @@
 #include <linux/kernel.h>
 
 #include <linux/of.h>
+#include <linux/of_address.h>
 
 #include "cpm_uart.h"
 
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 95917cefe14f..481b781b26e3 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -57,6 +57,8 @@
 #include <linux/bitops.h>
 #include <linux/sysrq.h>
 #include <linux/mutex.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <asm/sections.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 2fd1e1789811..d569ca58bab6 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -25,6 +25,8 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
 
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index f3bb363f1d4a..807127d56fa3 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -33,6 +33,7 @@
 #include <linux/io.h>
 #include <linux/moduleparam.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
 #include <linux/usb/ch9.h>
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 6cc5567bf9c8..875d2fcc9e0e 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -16,6 +16,8 @@
 #include <linux/signal.h>
 
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 0b46542591ff..0551c0af0fd1 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -26,6 +26,8 @@
 #include <linux/io.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/slab.h>
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 75f5a1e2f01e..81f3eba215c1 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -14,6 +14,8 @@
  */
 
 #include <linux/signal.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/prom.h>
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 6dd72250111e..b047ec58ac30 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -31,6 +31,8 @@
 #include <linux/uaccess.h>
 #include <linux/vmalloc.h>
 #include <linux/spinlock.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #include <sysdev/fsl_soc.h>
 #include <linux/fsl-diu-fb.h>
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index d294f67d6f84..32c8fc5f7a5c 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/of.h>
+#include <linux/of_irq.h>
 #include <linux/reboot.h>
 #include <linux/uaccess.h>
 #include <linux/notifier.h>
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index 257cfbad21da..3755833430dc 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -34,6 +34,7 @@
 #include <linux/watchdog.h>
 #include <linux/fs.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index da2752063bb7..d0ebebae607c 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/miscdevice.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/module.h>
 #include <linux/watchdog.h>
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c
index 7d3d471f810c..329bc60ad7a2 100644
--- a/drivers/watchdog/pika_wdt.c
+++ b/drivers/watchdog/pika_wdt.c
@@ -22,6 +22,7 @@
 #include <linux/bitops.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 
 #define DRV_NAME "PIKA-WDT"
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 106a83570630..70779b2fc209 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -14,16 +14,13 @@
 #include <linux/of.h>
 #include <linux/export.h>
 #include <linux/slab.h>
-#include <asm/prom.h>
 #include <asm/uaccess.h>
 #include "internal.h"
 
 static inline void set_node_proc_entry(struct device_node *np,
                                        struct proc_dir_entry *de)
 {
-#ifdef HAVE_ARCH_DEVTREE_FIXUPS
         np->pde = de;
-#endif
 }
 
 static struct proc_dir_entry *proc_device_tree;
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 801ff9e73679..fbd25c3c2923 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -18,6 +18,7 @@
 #include <linux/cpumask.h>
 
 struct device;
+struct device_node;
 
 struct cpu {
         int node_id;            /* The node which contains the CPU */
@@ -29,6 +30,8 @@ extern int register_cpu(struct cpu *cpu, int num);
 extern struct device *get_cpu_device(unsigned cpu);
 extern bool cpu_is_hotpluggable(unsigned cpu);
 extern bool arch_match_cpu_phys_id(int cpu, u64 phys_id);
+extern bool arch_find_n_match_cpu_physical_id(struct device_node *cpun,
+                                              int cpu, unsigned int *thread);
 
 extern int cpu_add_dev_attr(struct device_attribute *attr);
 extern void cpu_remove_dev_attr(struct device_attribute *attr);
diff --git a/include/linux/of.h b/include/linux/of.h
index ebf75f760bd3..276c546980d8 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -136,7 +136,9 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
         return of_read_number(cell, size);
 }
 
+#if defined(CONFIG_SPARC)
 #include <asm/prom.h>
+#endif
 
 /* Default #address and #size cells.  Allow arch asm/prom.h to override */
 #if !defined(OF_ROOT_NODE_ADDR_CELLS_DEFAULT)
@@ -288,6 +290,7 @@ extern int of_n_size_cells(struct device_node *np);
 extern const struct of_device_id *of_match_node(
         const struct of_device_id *matches, const struct device_node *node);
 extern int of_modalias_node(struct device_node *node, char *modalias, int len);
+extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args);
 extern struct device_node *of_parse_phandle(const struct device_node *np,
                                             const char *phandle_name,
                                             int index);
@@ -377,6 +380,9 @@ static inline bool of_have_populated_dt(void)
 #define for_each_child_of_node(parent, child) \
         while (0)
 
+#define for_each_available_child_of_node(parent, child) \
+        while (0)
+
 static inline struct device_node *of_get_child_by_name(
                                         const struct device_node *node,
                                         const char *name)
@@ -552,13 +558,10 @@ static inline const char *of_prop_next_string(struct property *prop,
 #define of_match_node(_matches, _node)  NULL
 #endif /* CONFIG_OF */
 
-#ifndef of_node_to_nid
-static inline int of_node_to_nid(struct device_node *np)
-{
-        return numa_node_id();
-}
-
-#define of_node_to_nid of_node_to_nid
+#if defined(CONFIG_OF) && defined(CONFIG_NUMA)
+extern int of_node_to_nid(struct device_node *np);
+#else
+static inline int of_node_to_nid(struct device_node *device) { return 0; }
 #endif
 
 /**
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 4c2e6f26432c..5f6ed6b182b8 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -34,6 +34,10 @@ static inline void of_pci_range_to_resource(struct of_pci_range *range,
         res->name = np->full_name;
 }
 
+/* Translate a DMA address from device space to CPU space */
+extern u64 of_translate_dma_address(struct device_node *dev,
+                                    const __be32 *in_addr);
+
 #ifdef CONFIG_OF_ADDRESS
 extern u64 of_translate_address(struct device_node *np, const __be32 *addr);
 extern bool of_can_translate_address(struct device_node *dev);
@@ -52,10 +56,7 @@ extern void __iomem *of_iomap(struct device_node *device, int index);
 extern const __be32 *of_get_address(struct device_node *dev, int index,
                            u64 *size, unsigned int *flags);
 
-#ifndef pci_address_to_pio
-static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }
-#define pci_address_to_pio pci_address_to_pio
-#endif
+extern unsigned long pci_address_to_pio(phys_addr_t addr);
 
 extern int of_pci_range_parser_init(struct of_pci_range_parser *parser,
                         struct device_node *node);
@@ -63,13 +64,6 @@ extern struct of_pci_range *of_pci_range_parser_one(
                                         struct of_pci_range_parser *parser,
                                         struct of_pci_range *range);
 #else /* CONFIG_OF_ADDRESS */
-#ifndef of_address_to_resource
-static inline int of_address_to_resource(struct device_node *dev, int index,
-                                         struct resource *r)
-{
-        return -EINVAL;
-}
-#endif
 static inline struct device_node *of_find_matching_node_by_address(
                                         struct device_node *from,
                                         const struct of_device_id *matches,
@@ -77,12 +71,7 @@ static inline struct device_node *of_find_matching_node_by_address(
 {
         return NULL;
 }
-#ifndef of_iomap
-static inline void __iomem *of_iomap(struct device_node *device, int index)
-{
-        return NULL;
-}
-#endif
+
 static inline const __be32 *of_get_address(struct device_node *dev, int index,
                                         u64 *size, unsigned int *flags)
 {
@@ -103,6 +92,22 @@ static inline struct of_pci_range *of_pci_range_parser_one(
 }
 #endif /* CONFIG_OF_ADDRESS */
 
+#ifdef CONFIG_OF
+extern int of_address_to_resource(struct device_node *dev, int index,
+                                  struct resource *r);
+void __iomem *of_iomap(struct device_node *node, int index);
+#else
+static inline int of_address_to_resource(struct device_node *dev, int index,
+                                         struct resource *r)
+{
+        return -EINVAL;
+}
+
+static inline void __iomem *of_iomap(struct device_node *device, int index)
+{
+        return NULL;
+}
+#endif
 
 #if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)
 extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index a478c62a2aab..0beaee9dac1f 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -96,31 +96,30 @@ extern int of_scan_flat_dt_by_path(const char *path,
 
 extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
                                      int depth, void *data);
-extern void early_init_dt_check_for_initrd(unsigned long node);
 extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
                                      int depth, void *data);
 extern void early_init_dt_add_memory_arch(u64 base, u64 size);
 extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align);
 extern u64 dt_mem_next_cell(int s, __be32 **cellp);
 
-/*
- * If BLK_DEV_INITRD, the fdt early init code will call this function,
- * to be provided by the arch code. start and end are specified as
- * physical addresses.
- */
-#ifdef CONFIG_BLK_DEV_INITRD
-extern void early_init_dt_setup_initrd_arch(u64 start, u64 end);
-#endif
-
 /* Early flat tree scan hooks */
 extern int early_init_dt_scan_root(unsigned long node, const char *uname,
                                    int depth, void *data);
 
+extern bool early_init_dt_scan(void *params);
+
+extern const char *of_flat_dt_get_machine_name(void);
+extern const void *of_flat_dt_match_machine(const void *default_match,
+                const void * (*get_next_compat)(const char * const**));
+
 /* Other Prototypes */
 extern void unflatten_device_tree(void);
+extern void unflatten_and_copy_device_tree(void);
 extern void early_init_devtree(void *);
 #else /* CONFIG_OF_FLATTREE */
+static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }
 static inline void unflatten_device_tree(void) {}
+static inline void unflatten_and_copy_device_tree(void) {}
 #endif /* CONFIG_OF_FLATTREE */
 
 #endif /* __ASSEMBLY__ */
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index fcd63baee5f2..3f23b4472c31 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -8,22 +8,6 @@
 #include <linux/ioport.h>
 #include <linux/of.h>
 
-/**
- * of_irq - container for device_node/irq_specifier pair for an irq controller
- * @controller: pointer to interrupt controller device tree node
- * @size: size of interrupt specifier
- * @specifier: array of cells @size long specifing the specific interrupt
- *
- * This structure is returned when an interrupt is mapped. The controller
- * field needs to be put() after use
- */
-#define OF_MAX_IRQ_SPEC         4 /* We handle specifiers of at most 4 cells */
-struct of_irq {
-        struct device_node *controller; /* Interrupt controller node */
-        u32 size; /* Specifier size */
-        u32 specifier[OF_MAX_IRQ_SPEC]; /* Specifier copy */
-};
-
 typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *);
 
 /*
@@ -35,35 +19,38 @@ typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *);
 #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_PMAC)
 extern unsigned int of_irq_workarounds;
 extern struct device_node *of_irq_dflt_pic;
-extern int of_irq_map_oldworld(struct device_node *device, int index,
-                               struct of_irq *out_irq);
+extern int of_irq_parse_oldworld(struct device_node *device, int index,
+                               struct of_phandle_args *out_irq);
 #else /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
 #define of_irq_workarounds (0)
 #define of_irq_dflt_pic (NULL)
-static inline int of_irq_map_oldworld(struct device_node *device, int index,
-                                      struct of_irq *out_irq)
+static inline int of_irq_parse_oldworld(struct device_node *device, int index,
+                                      struct of_phandle_args *out_irq)
 {
         return -EINVAL;
 }
 #endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
 
-
-extern int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
-                          u32 ointsize, const __be32 *addr,
-                          struct of_irq *out_irq);
-extern int of_irq_map_one(struct device_node *device, int index,
-                          struct of_irq *out_irq);
-extern unsigned int irq_create_of_mapping(struct device_node *controller,
-                                          const u32 *intspec,
-                                          unsigned int intsize);
+extern int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq);
+extern int of_irq_parse_one(struct device_node *device, int index,
+                          struct of_phandle_args *out_irq);
+extern unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data);
 extern int of_irq_to_resource(struct device_node *dev, int index,
                               struct resource *r);
-extern int of_irq_count(struct device_node *dev);
 extern int of_irq_to_resource_table(struct device_node *dev,
                 struct resource *res, int nr_irqs);
 
 extern void of_irq_init(const struct of_device_id *matches);
 
+#ifdef CONFIG_OF_IRQ
+extern int of_irq_count(struct device_node *dev);
+#else
+static inline int of_irq_count(struct device_node *dev)
+{
+        return 0;
+}
+#endif
+
 #if defined(CONFIG_OF)
 /*
  * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index fd9c408631a0..1a1f5ffd5288 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -5,8 +5,9 @@
 #include <linux/msi.h>
 
 struct pci_dev;
-struct of_irq;
-int of_irq_map_pci(const struct pci_dev *pdev, struct of_irq *out_irq);
+struct of_phandle_args;
+int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq);
+int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
 
 struct device_node;
 struct device_node *of_pci_find_child_device(struct device_node *parent,
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 706724e9835d..cf68bb36fe58 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -465,27 +465,26 @@ int irq_create_strict_mappings(struct irq_domain *domain, unsigned int irq_base,
 }
 EXPORT_SYMBOL_GPL(irq_create_strict_mappings);
 
-unsigned int irq_create_of_mapping(struct device_node *controller,
-                                   const u32 *intspec, unsigned int intsize)
+unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
 {
         struct irq_domain *domain;
         irq_hw_number_t hwirq;
         unsigned int type = IRQ_TYPE_NONE;
         unsigned int virq;
 
-        domain = controller ? irq_find_host(controller) : irq_default_domain;
+        domain = irq_data->np ? irq_find_host(irq_data->np) : irq_default_domain;
         if (!domain) {
                 pr_warn("no irq domain found for %s !\n",
-                        of_node_full_name(controller));
+                        of_node_full_name(irq_data->np));
                 return 0;
         }
 
         /* If domain has no translation, then we assume interrupt line */
         if (domain->ops->xlate == NULL)
-                hwirq = intspec[0];
+                hwirq = irq_data->args[0];
         else {
-                if (domain->ops->xlate(domain, controller, intspec, intsize,
-                                     &hwirq, &type))
+                if (domain->ops->xlate(domain, irq_data->np, irq_data->args,
+                                        irq_data->args_count, &hwirq, &type))
                         return 0;
         }
 
diff --git a/sound/aoa/core/gpio-feature.c b/sound/aoa/core/gpio-feature.c
index faa317490545..f34153962d07 100644
--- a/sound/aoa/core/gpio-feature.c
+++ b/sound/aoa/core/gpio-feature.c
@@ -10,8 +10,9 @@
  * registers.
  */
 
-#include <asm/pmac_feature.h>
+#include <linux/of_irq.h>
 #include <linux/interrupt.h>
+#include <asm/pmac_feature.h>
 #include "../aoa.h"
 
 /* TODO: these are lots of global variables
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index 15e76131b501..467836057ee5 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -11,6 +11,8 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #include <sound/core.h>
 
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index c93fbbb201fe..7a43c0c38316 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -28,6 +28,8 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <sound/core.h>
 #include "pmac.h"
 #include <sound/pcm_params.h>
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index b23354a4ceca..b9ffc17a4799 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/string.h>
+#include <linux/of_irq.h>
 #include <sound/core.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 9cc5c1f82f09..d1b111e7fc07 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -21,6 +21,8 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/gfp.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/list.h>
 #include <linux/slab.h>
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 2a847ca494b5..161e5055ce94 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -10,6 +10,8 @@
 #include <linux/of_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #include <sound/soc.h>
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 3ef7a0c92efa..24eafa2cfbf4 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -291,7 +291,7 @@ static int psc_ac97_of_probe(struct platform_device *op)
 
         rc = snd_soc_set_ac97_ops(&psc_ac97_ops);
         if (rc != 0) {
-                dev_err(&op->dev, "Failed to set AC'97 ops: %d\n", ret);
+                dev_err(&op->dev, "Failed to set AC'97 ops: %d\n", rc);
                 return rc;
         }
 
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 228c52e71440..fa756d05b2f7 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/slab.h>
 #include <sound/soc.h>
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index ba59c23a137b..f75c3cf0e6de 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/slab.h>
 #include <sound/soc.h>
diff --git a/sound/soc/fsl/p1022_rdk.c b/sound/soc/fsl/p1022_rdk.c
index f21551911533..9d89bb028621 100644
--- a/sound/soc/fsl/p1022_rdk.c
+++ b/sound/soc/fsl/p1022_rdk.c
@@ -19,6 +19,7 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/slab.h>
 #include <sound/soc.h>