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

Pull Devicetree updates from Rob Herring:
 "A bit bigger than normal as I've been busy this cycle.

  There's a few things with dependencies and a few things subsystem
  maintainers didn't pick up, so I'm taking them thru my tree.

  The fixes from Johan didn't get into linux-next, but they've been
  waiting for some time now and they are what's left of what subsystem
  maintainers didn't pick up.

  Summary:

   - Sync dtc with upstream version v1.4.7-14-gc86da84d30e4

   - Work to get rid of direct accesses to struct device_node name and
     type pointers in preparation for removing them. New helpers for
     parsing DT cpu nodes and conversions to use the helpers. printk
     conversions to %pOFn for printing DT node names. Most went thru
     subystem trees, so this is the remainder.

   - Fixes to DT child node lookups to actually be restricted to child
     nodes instead of treewide.

   - Refactoring of dtb targets out of arch code. This makes the support
     more uniform and enables building all dtbs on c6x, microblaze, and
     powerpc.

   - Various DT binding updates for Renesas r8a7744 SoC

   - Vendor prefixes for Facebook, OLPC

   - Restructuring of some ARM binding docs moving some peripheral
     bindings out of board/SoC binding files

   - New "secure-chosen" binding for secure world settings on ARM

   - Dual licensing of 2 DT IRQ binding headers"

* tag 'devicetree-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (78 commits)
  ARM: dt: relicense two DT binding IRQ headers
  power: supply: twl4030-charger: fix OF sibling-node lookup
  NFC: nfcmrvl_uart: fix OF child-node lookup
  net: stmmac: dwmac-sun8i: fix OF child-node lookup
  net: bcmgenet: fix OF child-node lookup
  drm/msm: fix OF child-node lookup
  drm/mediatek: fix OF sibling-node lookup
  of: Add missing exports of node name compare functions
  dt-bindings: Add OLPC vendor prefix
  dt-bindings: misc: bk4: Add device tree binding for Liebherr's BK4 SPI bus
  dt-bindings: thermal: samsung: Add SPDX license identifier
  dt-bindings: clock: samsung: Add SPDX license identifiers
  dt-bindings: timer: ostm: Add R7S9210 support
  dt-bindings: phy: rcar-gen2: Add r8a7744 support
  dt-bindings: can: rcar_can: Add r8a7744 support
  dt-bindings: timer: renesas, cmt: Document r8a7744 CMT support
  dt-bindings: watchdog: renesas-wdt: Document r8a7744 support
  dt-bindings: thermal: rcar: Add device tree support for r8a7744
  Documentation: dt: Add binding for /secure-chosen/stdout-path
  dt-bindings: arm: zte: Move sysctrl bindings to their own doc
  ...

140 files changed, 1736 insertions, 1043 deletions

diff --git a/Documentation/devicetree/bindings/arm/al,alpine.txt b/Documentation/devicetree/bindings/arm/al,alpine.txt
index f404a4f9b165..d00debe2e86f 100644
--- a/Documentation/devicetree/bindings/arm/al,alpine.txt
+++ b/Documentation/devicetree/bindings/arm/al,alpine.txt
@@ -14,75 +14,3 @@ compatible: must contain "al,alpine"
 
         ...
 }
-
-* CPU node:
-
-The Alpine platform includes cortex-a15 cores.
-enable-method: must be "al,alpine-smp" to allow smp  [1]
-
-Example:
-
-cpus {
-        #address-cells = <1>;
-        #size-cells = <0>;
-        enable-method = "al,alpine-smp";
-
-        cpu@0 {
-                compatible = "arm,cortex-a15";
-                device_type = "cpu";
-                reg = <0>;
-        };
-
-        cpu@1 {
-                compatible = "arm,cortex-a15";
-                device_type = "cpu";
-                reg = <1>;
-        };
-
-        cpu@2 {
-                compatible = "arm,cortex-a15";
-                device_type = "cpu";
-                reg = <2>;
-        };
-
-        cpu@3 {
-                compatible = "arm,cortex-a15";
-                device_type = "cpu";
-                reg = <3>;
-        };
-};
-
-
-* Alpine CPU resume registers
-
-The CPU resume register are used to define required resume address after
-reset.
-
-Properties:
-- compatible : Should contain "al,alpine-cpu-resume".
-- reg : Offset and length of the register set for the device
-
-Example:
-
-cpu_resume {
-        compatible = "al,alpine-cpu-resume";
-        reg = <0xfbff5ed0 0x30>;
-};
-
-* Alpine System-Fabric Service Registers
-
-The System-Fabric Service Registers allow various operation on CPU and
-system fabric, like powering CPUs off.
-
-Properties:
-- compatible : Should contain "al,alpine-sysfabric-service" and "syscon".
-- reg : Offset and length of the register set for the device
-
-Example:
-
-nb_service {
-        compatible = "al,alpine-sysfabric-service", "syscon";
-        reg = <0xfb070000 0x10000>;
-};
-
-[1] arm/cpu-enable-method/al,alpine-smp
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt
index 31220b54d85d..4bf1b4da7659 100644
--- a/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@ -70,173 +70,3 @@ compatible: must be one of:
        - "atmel,samv71q19"
        - "atmel,samv71q20"
        - "atmel,samv71q21"
-
-Chipid required properties:
-- compatible: Should be "atmel,sama5d2-chipid"
-- reg : Should contain registers location and length
-
-PIT Timer required properties:
-- compatible: Should be "atmel,at91sam9260-pit"
-- reg: Should contain registers location and length
-- interrupts: Should contain interrupt for the PIT which is the IRQ line
-  shared across all System Controller members.
-
-System Timer (ST) required properties:
-- compatible: Should be "atmel,at91rm9200-st", "syscon", "simple-mfd"
-- reg: Should contain registers location and length
-- interrupts: Should contain interrupt for the ST which is the IRQ line
-  shared across all System Controller members.
-- clocks: phandle to input clock.
-Its subnodes can be:
-- watchdog: compatible should be "atmel,at91rm9200-wdt"
-
-RSTC Reset Controller required properties:
-- compatible: Should be "atmel,<chip>-rstc".
-  <chip> can be "at91sam9260" or "at91sam9g45" or "sama5d3"
-- reg: Should contain registers location and length
-- clocks: phandle to input clock.
-
-Example:
-
-        rstc@fffffd00 {
-                compatible = "atmel,at91sam9260-rstc";
-                reg = <0xfffffd00 0x10>;
-                clocks = <&clk32k>;
-        };
-
-RAMC SDRAM/DDR Controller required properties:
-- compatible: Should be "atmel,at91rm9200-sdramc", "syscon"
-                        "atmel,at91sam9260-sdramc",
-                        "atmel,at91sam9g45-ddramc",
-                        "atmel,sama5d3-ddramc",
-- reg: Should contain registers location and length
-
-Examples:
-
-        ramc0: ramc@ffffe800 {
-                compatible = "atmel,at91sam9g45-ddramc";
-                reg = <0xffffe800 0x200>;
-        };
-
-SHDWC Shutdown Controller
-
-required properties:
-- compatible: Should be "atmel,<chip>-shdwc".
-  <chip> can be "at91sam9260", "at91sam9rl" or "at91sam9x5".
-- reg: Should contain registers location and length
-- clocks: phandle to input clock.
-
-optional properties:
-- atmel,wakeup-mode: String, operation mode of the wakeup mode.
-  Supported values are: "none", "high", "low", "any".
-- atmel,wakeup-counter: Counter on Wake-up 0 (between 0x0 and 0xf).
-
-optional at91sam9260 properties:
-- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
-
-optional at91sam9rl properties:
-- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
-- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
-
-optional at91sam9x5 properties:
-- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
-
-Example:
-
-        shdwc@fffffd10 {
-                compatible = "atmel,at91sam9260-shdwc";
-                reg = <0xfffffd10 0x10>;
-                clocks = <&clk32k>;
-        };
-
-SHDWC SAMA5D2-Compatible Shutdown Controller
-
-1) shdwc node
-
-required properties:
-- compatible: should be "atmel,sama5d2-shdwc".
-- reg: should contain registers location and length
-- clocks: phandle to input clock.
-- #address-cells: should be one. The cell is the wake-up input index.
-- #size-cells: should be zero.
-
-optional properties:
-
-- debounce-delay-us: minimum wake-up inputs debouncer period in
-  microseconds. It's usually a board-related property.
-- atmel,wakeup-rtc-timer: boolean to enable Real-Time Clock wake-up.
-
-The node contains child nodes for each wake-up input that the platform uses.
-
-2) input nodes
-
-Wake-up input nodes are usually described in the "board" part of the Device
-Tree. Note also that input 0 is linked to the wake-up pin and is frequently
-used.
-
-Required properties:
-- reg: should contain the wake-up input index [0 - 15].
-
-Optional properties:
-- atmel,wakeup-active-high: boolean, the corresponding wake-up input described
-  by the child, forces the wake-up of the core power supply on a high level.
-  The default is to be active low.
-
-Example:
-
-On the SoC side:
-        shdwc@f8048010 {
-                compatible = "atmel,sama5d2-shdwc";
-                reg = <0xf8048010 0x10>;
-                clocks = <&clk32k>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                atmel,wakeup-rtc-timer;
-        };
-
-On the board side:
-        shdwc@f8048010 {
-                debounce-delay-us = <976>;
-
-                input@0 {
-                        reg = <0>;
-                };
-
-                input@1 {
-                        reg = <1>;
-                        atmel,wakeup-active-high;
-                };
-        };
-
-Special Function Registers (SFR)
-
-Special Function Registers (SFR) manage specific aspects of the integrated
-memory, bridge implementations, processor and other functionality not controlled
-elsewhere.
-
-required properties:
-- compatible: Should be "atmel,<chip>-sfr", "syscon" or
-        "atmel,<chip>-sfrbu", "syscon"
-  <chip> can be "sama5d3", "sama5d4" or "sama5d2".
-- reg: Should contain registers location and length
-
-        sfr@f0038000 {
-                compatible = "atmel,sama5d3-sfr", "syscon";
-                reg = <0xf0038000 0x60>;
-        };
-
-Security Module (SECUMOD)
-
-The Security Module macrocell provides all necessary secure functions to avoid
-voltage, temperature, frequency and mechanical attacks on the chip. It also
-embeds secure memories that can be scrambled
-
-required properties:
-- compatible: Should be "atmel,<chip>-secumod", "syscon".
-  <chip> can be "sama5d2".
-- reg: Should contain registers location and length
-
-        secumod@fc040000 {
-                compatible = "atmel,sama5d2-secumod", "syscon";
-                reg = <0xfc040000 0x100>;
-        };
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
new file mode 100644
index 000000000000..4b96608ad692
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -0,0 +1,171 @@
+Atmel system registers
+
+Chipid required properties:
+- compatible: Should be "atmel,sama5d2-chipid"
+- reg : Should contain registers location and length
+
+PIT Timer required properties:
+- compatible: Should be "atmel,at91sam9260-pit"
+- reg: Should contain registers location and length
+- interrupts: Should contain interrupt for the PIT which is the IRQ line
+  shared across all System Controller members.
+
+System Timer (ST) required properties:
+- compatible: Should be "atmel,at91rm9200-st", "syscon", "simple-mfd"
+- reg: Should contain registers location and length
+- interrupts: Should contain interrupt for the ST which is the IRQ line
+  shared across all System Controller members.
+- clocks: phandle to input clock.
+Its subnodes can be:
+- watchdog: compatible should be "atmel,at91rm9200-wdt"
+
+RSTC Reset Controller required properties:
+- compatible: Should be "atmel,<chip>-rstc".
+  <chip> can be "at91sam9260" or "at91sam9g45" or "sama5d3"
+- reg: Should contain registers location and length
+- clocks: phandle to input clock.
+
+Example:
+
+        rstc@fffffd00 {
+                compatible = "atmel,at91sam9260-rstc";
+                reg = <0xfffffd00 0x10>;
+                clocks = <&clk32k>;
+        };
+
+RAMC SDRAM/DDR Controller required properties:
+- compatible: Should be "atmel,at91rm9200-sdramc", "syscon"
+                        "atmel,at91sam9260-sdramc",
+                        "atmel,at91sam9g45-ddramc",
+                        "atmel,sama5d3-ddramc",
+- reg: Should contain registers location and length
+
+Examples:
+
+        ramc0: ramc@ffffe800 {
+                compatible = "atmel,at91sam9g45-ddramc";
+                reg = <0xffffe800 0x200>;
+        };
+
+SHDWC Shutdown Controller
+
+required properties:
+- compatible: Should be "atmel,<chip>-shdwc".
+  <chip> can be "at91sam9260", "at91sam9rl" or "at91sam9x5".
+- reg: Should contain registers location and length
+- clocks: phandle to input clock.
+
+optional properties:
+- atmel,wakeup-mode: String, operation mode of the wakeup mode.
+  Supported values are: "none", "high", "low", "any".
+- atmel,wakeup-counter: Counter on Wake-up 0 (between 0x0 and 0xf).
+
+optional at91sam9260 properties:
+- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
+
+optional at91sam9rl properties:
+- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
+- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
+
+optional at91sam9x5 properties:
+- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
+
+Example:
+
+        shdwc@fffffd10 {
+                compatible = "atmel,at91sam9260-shdwc";
+                reg = <0xfffffd10 0x10>;
+                clocks = <&clk32k>;
+        };
+
+SHDWC SAMA5D2-Compatible Shutdown Controller
+
+1) shdwc node
+
+required properties:
+- compatible: should be "atmel,sama5d2-shdwc".
+- reg: should contain registers location and length
+- clocks: phandle to input clock.
+- #address-cells: should be one. The cell is the wake-up input index.
+- #size-cells: should be zero.
+
+optional properties:
+
+- debounce-delay-us: minimum wake-up inputs debouncer period in
+  microseconds. It's usually a board-related property.
+- atmel,wakeup-rtc-timer: boolean to enable Real-Time Clock wake-up.
+
+The node contains child nodes for each wake-up input that the platform uses.
+
+2) input nodes
+
+Wake-up input nodes are usually described in the "board" part of the Device
+Tree. Note also that input 0 is linked to the wake-up pin and is frequently
+used.
+
+Required properties:
+- reg: should contain the wake-up input index [0 - 15].
+
+Optional properties:
+- atmel,wakeup-active-high: boolean, the corresponding wake-up input described
+  by the child, forces the wake-up of the core power supply on a high level.
+  The default is to be active low.
+
+Example:
+
+On the SoC side:
+        shdwc@f8048010 {
+                compatible = "atmel,sama5d2-shdwc";
+                reg = <0xf8048010 0x10>;
+                clocks = <&clk32k>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                atmel,wakeup-rtc-timer;
+        };
+
+On the board side:
+        shdwc@f8048010 {
+                debounce-delay-us = <976>;
+
+                input@0 {
+                        reg = <0>;
+                };
+
+                input@1 {
+                        reg = <1>;
+                        atmel,wakeup-active-high;
+                };
+        };
+
+Special Function Registers (SFR)
+
+Special Function Registers (SFR) manage specific aspects of the integrated
+memory, bridge implementations, processor and other functionality not controlled
+elsewhere.
+
+required properties:
+- compatible: Should be "atmel,<chip>-sfr", "syscon" or
+        "atmel,<chip>-sfrbu", "syscon"
+  <chip> can be "sama5d3", "sama5d4" or "sama5d2".
+- reg: Should contain registers location and length
+
+        sfr@f0038000 {
+                compatible = "atmel,sama5d3-sfr", "syscon";
+                reg = <0xf0038000 0x60>;
+        };
+
+Security Module (SECUMOD)
+
+The Security Module macrocell provides all necessary secure functions to avoid
+voltage, temperature, frequency and mechanical attacks on the chip. It also
+embeds secure memories that can be scrambled
+
+required properties:
+- compatible: Should be "atmel,<chip>-secumod", "syscon".
+  <chip> can be "sama5d2".
+- reg: Should contain registers location and length
+
+        secumod@fc040000 {
+                compatible = "atmel,sama5d2-secumod", "syscon";
+                reg = <0xfc040000 0x100>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp b/Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp
index c2e0cc5e4cfd..35e5afb6d9ad 100644
--- a/Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp
+++ b/Documentation/devicetree/bindings/arm/cpu-enable-method/al,alpine-smp
@@ -14,7 +14,28 @@ Related properties:	(none)
 
 Note:
 This enable method requires valid nodes compatible with
-"al,alpine-cpu-resume" and "al,alpine-nb-service"[1].
+"al,alpine-cpu-resume" and "al,alpine-nb-service".
+
+
+* Alpine CPU resume registers
+
+The CPU resume register are used to define required resume address after
+reset.
+
+Properties:
+- compatible : Should contain "al,alpine-cpu-resume".
+- reg : Offset and length of the register set for the device
+
+
+* Alpine System-Fabric Service Registers
+
+The System-Fabric Service Registers allow various operation on CPU and
+system fabric, like powering CPUs off.
+
+Properties:
+- compatible : Should contain "al,alpine-sysfabric-service" and "syscon".
+- reg : Offset and length of the register set for the device
+
 
 Example:
 
@@ -48,5 +69,12 @@ cpus {
         };
 };
 
---
-[1] arm/al,alpine.txt
+cpu_resume {
+        compatible = "al,alpine-cpu-resume";
+        reg = <0xfbff5ed0 0x30>;
+};
+
+nb_service {
+        compatible = "al,alpine-sysfabric-service", "syscon";
+        reg = <0xfb070000 0x10000>;
+};
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index 96dfccc0faa8..b0198a1cf403 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -276,7 +276,7 @@ described below.
                 Usage: optional
                 Value type: <prop-encoded-array>
                 Definition: A u32 value that represents the running time dynamic
-                            power coefficient in units of mW/MHz/uV^2. The
+                            power coefficient in units of uW/MHz/V^2. The
                             coefficient can either be calculated from power
                             measurements or derived by analysis.
 
@@ -287,7 +287,7 @@ described below.
 
                             Pdyn = dynamic-power-coefficient * V^2 * f
 
-                            where voltage is in uV, frequency is in MHz.
+                            where voltage is in V, frequency is in MHz.
 
 Example 1 (dual-cluster big.LITTLE system 32-bit):
 
diff --git a/Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt b/Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt
new file mode 100644
index 000000000000..b5cb374dc47d
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt
@@ -0,0 +1,19 @@
+Freescale DCFG
+
+DCFG is the device configuration unit, that provides general purpose
+configuration and status for the device. Such as setting the secondary
+core start address and release the secondary core from holdoff and startup.
+
+Required properties:
+  - compatible: Should contain a chip-specific compatible string,
+        Chip-specific strings are of the form "fsl,<chip>-dcfg",
+        The following <chip>s are known to be supported:
+        ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.
+
+  - reg : should contain base address and length of DCFG memory-mapped registers
+
+Example:
+        dcfg: dcfg@1ee0000 {
+                compatible = "fsl,ls1021a-dcfg";
+                reg = <0x0 0x1ee0000 0x0 0x10000>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-scfg.txt b/Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-scfg.txt
new file mode 100644
index 000000000000..0ab67b0b216d
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-scfg.txt
@@ -0,0 +1,19 @@
+Freescale SCFG
+
+SCFG is the supplemental configuration unit, that provides SoC specific
+configuration and status registers for the chip. Such as getting PEX port
+status.
+
+Required properties:
+  - compatible: Should contain a chip-specific compatible string,
+        Chip-specific strings are of the form "fsl,<chip>-scfg",
+        The following <chip>s are known to be supported:
+        ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.
+
+  - reg: should contain base address and length of SCFG memory-mapped registers
+
+Example:
+        scfg: scfg@1570000 {
+                compatible = "fsl,ls1021a-scfg";
+                reg = <0x0 0x1570000 0x0 0x10000>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index 8a1baa2b9723..1e775aaa5c5b 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -101,45 +101,6 @@ Freescale LS1021A Platform Device Tree Bindings
 Required root node compatible properties:
   - compatible = "fsl,ls1021a";
 
-Freescale SoC-specific Device Tree Bindings
--------------------------------------------
-
-Freescale SCFG
-  SCFG is the supplemental configuration unit, that provides SoC specific
-configuration and status registers for the chip. Such as getting PEX port
-status.
-  Required properties:
-  - compatible: Should contain a chip-specific compatible string,
-        Chip-specific strings are of the form "fsl,<chip>-scfg",
-        The following <chip>s are known to be supported:
-        ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.
-
-  - reg: should contain base address and length of SCFG memory-mapped registers
-
-Example:
-        scfg: scfg@1570000 {
-                compatible = "fsl,ls1021a-scfg";
-                reg = <0x0 0x1570000 0x0 0x10000>;
-        };
-
-Freescale DCFG
-  DCFG is the device configuration unit, that provides general purpose
-configuration and status for the device. Such as setting the secondary
-core start address and release the secondary core from holdoff and startup.
-  Required properties:
-  - compatible: Should contain a chip-specific compatible string,
-        Chip-specific strings are of the form "fsl,<chip>-dcfg",
-        The following <chip>s are known to be supported:
-        ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.
-
-  - reg : should contain base address and length of DCFG memory-mapped registers
-
-Example:
-        dcfg: dcfg@1ee0000 {
-                compatible = "fsl,ls1021a-dcfg";
-                reg = <0x0 0x1ee0000 0x0 0x10000>;
-        };
-
 Freescale ARMv8 based Layerscape SoC family Device Tree Bindings
 ----------------------------------------------------------------
 
diff --git a/Documentation/devicetree/bindings/arm/secure.txt b/Documentation/devicetree/bindings/arm/secure.txt
index e31303fb233a..f27bbff2c780 100644
--- a/Documentation/devicetree/bindings/arm/secure.txt
+++ b/Documentation/devicetree/bindings/arm/secure.txt
@@ -32,7 +32,8 @@ describe the view of Secure world using the standard bindings. These
 secure- bindings only need to be used where both the Secure and Normal
 world views need to be described in a single device tree.
 
-Valid Secure world properties:
+Valid Secure world properties
+-----------------------------
 
 - secure-status : specifies whether the device is present and usable
   in the secure world. The combination of this with "status" allows
@@ -51,3 +52,19 @@ Valid Secure world properties:
    status = "disabled"; secure-status = "okay";     /* S-only */
    status = "disabled";                             /* disabled in both */
    status = "disabled"; secure-status = "disabled"; /* disabled in both */
+
+The secure-chosen node
+----------------------
+
+Similar to the /chosen node which serves as a place for passing data
+between firmware and the operating system, the /secure-chosen node may
+be used to pass data to the Secure OS. Only the properties defined
+below may appear in the /secure-chosen node.
+
+- stdout-path : specifies the device to be used by the Secure OS for
+  its console output. The syntax is the same as for /chosen/stdout-path.
+  If the /secure-chosen node exists but the stdout-path property is not
+  present, the Secure OS should not perform any console output. If
+  /secure-chosen does not exist, the Secure OS should use the value of
+  /chosen/stdout-path instead (that is, use the same device as the
+  Normal world OS).
diff --git a/Documentation/devicetree/bindings/arm/zte,sysctrl.txt b/Documentation/devicetree/bindings/arm/zte,sysctrl.txt
new file mode 100644
index 000000000000..7e66b7f7ba96
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/zte,sysctrl.txt
@@ -0,0 +1,30 @@
+ZTE sysctrl Registers
+
+Registers for 'zte,zx296702' SoC:
+
+System management required properties:
+      - compatible = "zte,sysctrl"
+
+Low power management required properties:
+      - compatible = "zte,zx296702-pcu"
+
+Bus matrix required properties:
+      - compatible = "zte,zx-bus-matrix"
+
+
+Registers for 'zte,zx296718' SoC:
+
+System management required properties:
+      - compatible = "zte,zx296718-aon-sysctrl"
+      - compatible = "zte,zx296718-sysctrl"
+
+Example:
+aon_sysctrl: aon-sysctrl@116000 {
+        compatible = "zte,zx296718-aon-sysctrl", "syscon";
+        reg = <0x116000 0x1000>;
+};
+
+sysctrl: sysctrl@1463000 {
+        compatible = "zte,zx296718-sysctrl", "syscon";
+        reg = <0x1463000 0x1000>;
+};
diff --git a/Documentation/devicetree/bindings/arm/zte.txt b/Documentation/devicetree/bindings/arm/zte.txt
index 83369785d29c..340612794a37 100644
--- a/Documentation/devicetree/bindings/arm/zte.txt
+++ b/Documentation/devicetree/bindings/arm/zte.txt
@@ -1,20 +1,10 @@
 ZTE platforms device tree bindings
----------------------------------------
 
+---------------------------------------
 -  ZX296702 board:
     Required root node properties:
       - compatible = "zte,zx296702-ad1", "zte,zx296702"
 
-System management required properties:
-      - compatible = "zte,sysctrl"
-
-Low power management required properties:
-      - compatible = "zte,zx296702-pcu"
-
-Bus matrix required properties:
-      - compatible = "zte,zx-bus-matrix"
-
-
 ---------------------------------------
 -  ZX296718 SoC:
     Required root node properties:
@@ -22,18 +12,3 @@ Bus matrix required properties:
 
 ZX296718 EVB board:
       - "zte,zx296718-evb"
-
-System management required properties:
-      - compatible = "zte,zx296718-aon-sysctrl"
-      - compatible = "zte,zx296718-sysctrl"
-
-Example:
-aon_sysctrl: aon-sysctrl@116000 {
-        compatible = "zte,zx296718-aon-sysctrl", "syscon";
-        reg = <0x116000 0x1000>;
-};
-
-sysctrl: sysctrl@1463000 {
-        compatible = "zte,zx296718-sysctrl", "syscon";
-        reg = <0x1463000 0x1000>;
-};
diff --git a/Documentation/devicetree/bindings/crypto/hisilicon,hip07-sec.txt b/Documentation/devicetree/bindings/crypto/hisilicon,hip07-sec.txt
index 78d2db9d4de5..d28fd1af01b4 100644
--- a/Documentation/devicetree/bindings/crypto/hisilicon,hip07-sec.txt
+++ b/Documentation/devicetree/bindings/crypto/hisilicon,hip07-sec.txt
@@ -24,7 +24,7 @@ Optional properties:
 
 Example:
 
-p1_sec_a: crypto@400,d2000000 {
+p1_sec_a: crypto@400d2000000 {
         compatible = "hisilicon,hip07-sec";
         reg = <0x400 0xd0000000 0x0 0x10000
                0x400 0xd2000000 0x0 0x10000
diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
index 6db8aeda461a..90c44694a30b 100644
--- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
+++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
@@ -415,7 +415,7 @@ DT Overlay contains:
                         firmware-name = "base.rbf";
 
                         fpga-bridge@4400 {
-                                compatible = "altr,freeze-bridge";
+                                compatible = "altr,freeze-bridge-controller";
                                 reg = <0x4400 0x10>;
 
                                 fpga_region1: fpga-region1 {
@@ -427,7 +427,7 @@ DT Overlay contains:
                         };
 
                         fpga-bridge@4420 {
-                                compatible = "altr,freeze-bridge";
+                                compatible = "altr,freeze-bridge-controller";
                                 reg = <0x4420 0x10>;
 
                                 fpga_region2: fpga-region2 {
diff --git a/Documentation/devicetree/bindings/i2c/i2c.txt b/Documentation/devicetree/bindings/i2c/i2c.txt
index 11263982470e..44efafdfd7f5 100644
--- a/Documentation/devicetree/bindings/i2c/i2c.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c.txt
@@ -84,7 +84,7 @@ Binding may contain optional "interrupts" property, describing interrupts
 used by the device. I2C core will assign "irq" interrupt (or the very first
 interrupt if not using interrupt names) as primary interrupt for the slave.
 
-Alternatively, devices supporting SMbus Host Notify, and connected to
+Alternatively, devices supporting SMBus Host Notify, and connected to
 adapters that support this feature, may use "host-notify" property. I2C
 core will create a virtual interrupt for Host Notify and assign it as
 primary interrupt for the slave.
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index 9b62831fdf3e..148ef621a5e5 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -76,7 +76,7 @@ Deprecated properties:
 Also see child specific device properties:
   Regulator - ../regulator/arizona-regulator.txt
   Extcon    - ../extcon/extcon-arizona.txt
-  Sound     - ../sound/arizona.txt
+  Sound     - ../sound/wlf,arizona.txt
 
 Example:
 
diff --git a/Documentation/devicetree/bindings/misc/lwn-bk4.txt b/Documentation/devicetree/bindings/misc/lwn-bk4.txt
new file mode 100644
index 000000000000..d6a8c188c087
--- /dev/null
+++ b/Documentation/devicetree/bindings/misc/lwn-bk4.txt
@@ -0,0 +1,26 @@
+* Liebherr's BK4 controller external SPI
+
+A device which handles data acquisition from compatible industrial
+peripherals.
+The SPI is used for data and management purposes in both master and
+slave modes.
+
+Required properties:
+
+- compatible : Should be "lwn,bk4"
+
+Required SPI properties:
+
+- reg : Should be address of the device chip select within
+  the controller.
+
+- spi-max-frequency : Maximum SPI clocking speed of device in Hz, should be
+  30MHz at most for the Liebherr's BK4 external bus.
+
+Example:
+
+spidev0: spi@0 {
+        compatible = "lwn,bk4";
+        spi-max-frequency = <30000000>;
+        reg = <0>;
+};
diff --git a/Documentation/devicetree/bindings/net/can/rcar_can.txt b/Documentation/devicetree/bindings/net/can/rcar_can.txt
index 94a7f33ac5e9..cc4372842bf3 100644
--- a/Documentation/devicetree/bindings/net/can/rcar_can.txt
+++ b/Documentation/devicetree/bindings/net/can/rcar_can.txt
@@ -3,6 +3,7 @@ Renesas R-Car CAN controller Device Tree Bindings
 
 Required properties:
 - compatible: "renesas,can-r8a7743" if CAN controller is a part of R8A7743 SoC.
+              "renesas,can-r8a7744" if CAN controller is a part of R8A7744 SoC.
               "renesas,can-r8a7745" if CAN controller is a part of R8A7745 SoC.
               "renesas,can-r8a7778" if CAN controller is a part of R8A7778 SoC.
               "renesas,can-r8a7779" if CAN controller is a part of R8A7779 SoC.
diff --git a/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt b/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt
index eeb9e1874ea6..4f0879a0ca12 100644
--- a/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt
@@ -5,6 +5,7 @@ This file provides information on what the device node for the R-Car generation
 
 Required properties:
 - compatible: "renesas,usb-phy-r8a7743" if the device is a part of R8A7743 SoC.
+              "renesas,usb-phy-r8a7744" if the device is a part of R8A7744 SoC.
               "renesas,usb-phy-r8a7745" if the device is a part of R8A7745 SoC.
               "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.
               "renesas,usb-phy-r8a7791" if the device is a part of R8A7791 SoC.
diff --git a/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt b/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
index 5e1afc3d8480..1ab1d109318e 100644
--- a/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
+++ b/Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
@@ -5,7 +5,7 @@ Please also refer to reset.txt in this directory for common reset
 controller binding usage.
 
 Required properties:
-- compatible: Should be "fsl,imx7-src", "syscon"
+- compatible: Should be "fsl,imx7d-src", "syscon"
 - reg: should be register base and length as documented in the
   datasheet
 - interrupts: Should contain SRC interrupt
diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.txt b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
index 49948fcc0631..33992679a8bd 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
@@ -24,6 +24,8 @@ Required Properties:
     - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4.
     - "renesas,r8a7743-cmt0" for the 32-bit CMT0 device included in r8a7743.
     - "renesas,r8a7743-cmt1" for the 48-bit CMT1 device included in r8a7743.
+    - "renesas,r8a7744-cmt0" for the 32-bit CMT0 device included in r8a7744.
+    - "renesas,r8a7744-cmt1" for the 48-bit CMT1 device included in r8a7744.
     - "renesas,r8a7745-cmt0" for the 32-bit CMT0 device included in r8a7745.
     - "renesas,r8a7745-cmt1" for the 48-bit CMT1 device included in r8a7745.
     - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790.
diff --git a/Documentation/devicetree/bindings/timer/renesas,ostm.txt b/Documentation/devicetree/bindings/timer/renesas,ostm.txt
index be3ae0fdf775..81a78f8bcf17 100644
--- a/Documentation/devicetree/bindings/timer/renesas,ostm.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,ostm.txt
@@ -9,7 +9,8 @@ Channels are independent from each other.
 Required Properties:
 
   - compatible: must be one or more of the following:
-    - "renesas,r7s72100-ostm" for the r7s72100 OSTM
+    - "renesas,r7s72100-ostm" for the R7S72100 (RZ/A1) OSTM
+    - "renesas,r7s9210-ostm" for the R7S9210 (RZ/A2) OSTM
     - "renesas,ostm" for any OSTM
                 This is a fallback for the above renesas,*-ostm entries
 
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index f26bf667e530..376f24484182 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -127,6 +127,7 @@ everspin	Everspin Technologies, Inc.
 exar    Exar Corporation
 excito  Excito
 ezchip  EZchip Semiconductor
+facebook        Facebook
 fairphone       Fairphone B.V.
 faraday Faraday Technology Corporation
 fastrax Fastrax Oy
@@ -275,6 +276,7 @@ nxp	NXP Semiconductors
 okaya   Okaya Electric America, Inc.
 oki     Oki Electric Industry Co., Ltd.
 olimex  OLIMEX Ltd.
+olpc    One Laptop Per Child
 onion   Onion Corporation
 onnn    ON Semiconductor Corp.
 ontat   On Tat Industrial Company
diff --git a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
index 9407212a85a8..d72d1181ec62 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
@@ -6,6 +6,7 @@ Required properties:
                 version.
                Examples with soctypes are:
                  - "renesas,r8a7743-wdt" (RZ/G1M)
+                 - "renesas,r8a7744-wdt" (RZ/G1N)
                  - "renesas,r8a7745-wdt" (RZ/G1E)
                  - "renesas,r8a774a1-wdt" (RZ/G2M)
                  - "renesas,r8a7790-wdt" (R-Car H2)
diff --git a/Makefile b/Makefile
index 2fc5732a4f9e..7d4ba5196010 100644
--- a/Makefile
+++ b/Makefile
@@ -1063,7 +1063,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE
 # Carefully list dependencies so we do not try to build scripts twice
 # in parallel
 PHONY += scripts
-scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h)
+scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h)
         $(Q)$(MAKE) $(build)=$(@)
 
 # Things we need to do before we recursively start building the kernel
@@ -1213,6 +1213,35 @@ kselftest-merge:
         +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 
 # ---------------------------------------------------------------------------
+# Devicetree files
+
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/boot/dts/),)
+dtstree := arch/$(SRCARCH)/boot/dts
+endif
+
+ifneq ($(dtstree),)
+
+%.dtb: prepare3 scripts_dtc
+        $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
+
+PHONY += dtbs dtbs_install
+dtbs: prepare3 scripts_dtc
+        $(Q)$(MAKE) $(build)=$(dtstree)
+
+dtbs_install:
+        $(Q)$(MAKE) $(dtbinst)=$(dtstree)
+
+ifdef CONFIG_OF_EARLY_FLATTREE
+all: dtbs
+endif
+
+endif
+
+PHONY += scripts_dtc
+scripts_dtc: scripts_basic
+        $(Q)$(MAKE) $(build)=scripts/dtc
+
+# ---------------------------------------------------------------------------
 # Modules
 
 ifdef CONFIG_MODULES
@@ -1421,6 +1450,12 @@ help:
         @echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existing'
         @echo  '                    .config.'
         @echo  ''
+        @$(if $(dtstree), \
+                echo 'Devicetree:'; \
+                echo '* dtbs            - Build device tree blobs for enabled boards'; \
+                echo '  dtbs_install    - Install dtbs to $(INSTALL_DTBS_PATH)'; \
+                echo '')
+
         @echo 'Userspace tools targets:'
         @echo '  use "make tools/help"'
         @echo '  or  "cd tools; make help"'
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 644815c0516e..c64c505d966c 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -102,11 +102,5 @@ boot_targets += uImage uImage.bin uImage.gz
 $(boot_targets): vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
-%.dtb %.dtb.S %.dtb.o: scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
-
-dtbs: scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts
-
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5c91e0093ee8..05a91d8b89f3 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -303,12 +303,7 @@ else
 KBUILD_IMAGE := $(boot)/zImage
 endif
 
-# Build the DT binary blobs if we have OF configured
-ifeq ($(CONFIG_USE_OF),y)
-KBUILD_DTBS := dtbs
-endif
-
-all:    $(notdir $(KBUILD_IMAGE)) $(KBUILD_DTBS)
+all:    $(notdir $(KBUILD_IMAGE))
 
 
 archheaders:
@@ -335,17 +330,6 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
         $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-%.dtb: | scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
-
-PHONY += dtbs dtbs_install
-
-dtbs: prepare scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts
-
-dtbs_install:
-        $(Q)$(MAKE) $(dtbinst)=$(boot)/dts
-
 PHONY += vdso_install
 vdso_install:
 ifeq ($(CONFIG_VDSO),y)
@@ -367,8 +351,6 @@ define archhelp
   echo  '  uImage        - U-Boot wrapped zImage'
   echo  '  bootpImage    - Combined zImage and initial RAM disk'
   echo  '                  (supply initrd image via make variable INITRD=<path>)'
-  echo  '* dtbs          - Build device tree blobs for enabled boards'
-  echo  '  dtbs_install  - Install dtbs to $(INSTALL_DTBS_PATH)'
   echo  '  install       - Install uncompressed kernel'
   echo  '  zinstall      - Install compressed kernel'
   echo  '  uinstall      - Install U-Boot wrapped compressed kernel'
diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h
index 07437816e098..b36c0289a308 100644
--- a/arch/arm/boot/compressed/libfdt_env.h
+++ b/arch/arm/boot/compressed/libfdt_env.h
@@ -6,6 +6,8 @@
 #include <linux/string.h>
 #include <asm/byteorder.h>
 
+#define INT_MAX                 ((int)(~0U>>1))
+
 typedef __be16 fdt16_t;
 typedef __be32 fdt32_t;
 typedef __be64 fdt64_t;
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index ecaa68dd1af5..13bcd3b867cb 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -87,14 +87,11 @@ void __init arm_dt_init_cpu_maps(void)
         if (!cpus)
                 return;
 
-        for_each_child_of_node(cpus, cpu) {
+        for_each_of_cpu_node(cpu) {
                 const __be32 *cell;
                 int prop_bytes;
                 u32 hwid;
 
-                if (of_node_cmp(cpu->type, "cpu"))
-                        continue;
-
                 pr_debug(" * %pOF...\n", cpu);
                 /*
                  * A device tree containing CPU nodes with missing "reg"
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 24ac3cab411d..60e375ce1ab2 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -94,12 +94,6 @@ static void __init parse_dt_topology(void)
         __cpu_capacity = kcalloc(nr_cpu_ids, sizeof(*__cpu_capacity),
                                  GFP_NOWAIT);
 
-        cn = of_find_node_by_path("/cpus");
-        if (!cn) {
-                pr_err("No CPU information found in DT\n");
-                return;
-        }
-
         for_each_possible_cpu(cpu) {
                 const u32 *rate;
                 int len;
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index 345af3ebcc3a..7efe95bd584f 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -50,7 +50,7 @@ void __init rcar_gen2_pm_init(void)
         void __iomem *p;
         u32 bar;
         static int once;
-        struct device_node *np, *cpus;
+        struct device_node *np;
         bool has_a7 = false;
         bool has_a15 = false;
         struct resource res;
@@ -59,11 +59,7 @@ void __init rcar_gen2_pm_init(void)
         if (once++)
                 return;
 
-        cpus = of_find_node_by_path("/cpus");
-        if (!cpus)
-                return;
-
-        for_each_child_of_node(cpus, np) {
+        for_each_of_cpu_node(np) {
                 if (of_device_is_compatible(np, "arm,cortex-a15"))
                         has_a15 = true;
                 else if (of_device_is_compatible(np, "arm,cortex-a7"))
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index e348bcfe389d..94fdeef11b81 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -202,7 +202,7 @@ static void __init get_special_pds(void)
         const struct of_device_id *id;
 
         /* PM domains containing CPUs */
-        for_each_node_by_type(np, "cpu")
+        for_each_of_cpu_node(np)
                 add_special_pd(np, PD_CPU);
 
         /* PM domain containing console */
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 828e8aea037e..e48b0939693f 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -22,22 +22,16 @@
 
 void __init shmobile_init_delay(void)
 {
-        struct device_node *np, *cpus;
+        struct device_node *np;
         u32 max_freq = 0;
 
-        cpus = of_find_node_by_path("/cpus");
-        if (!cpus)
-                return;
-
-        for_each_child_of_node(cpus, np) {
+        for_each_of_cpu_node(np) {
                 u32 freq;
 
                 if (!of_property_read_u32(np, "clock-frequency", &freq))
                         max_freq = max(max_freq, freq);
         }
 
-        of_node_put(cpus);
-
         if (!max_freq)
                 return;
 
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 106039d25e2f..b4e994cd3a42 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -113,9 +113,8 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 # Default target when executing plain make
 boot            := arch/arm64/boot
 KBUILD_IMAGE    := $(boot)/Image.gz
-KBUILD_DTBS     := dtbs
 
-all:    Image.gz $(KBUILD_DTBS)
+all:    Image.gz
 
 
 Image: vmlinux
@@ -127,17 +126,6 @@ Image.%: Image
 zinstall install:
         $(Q)$(MAKE) $(build)=$(boot) $@
 
-%.dtb: scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
-
-PHONY += dtbs dtbs_install
-
-dtbs: prepare scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts
-
-dtbs_install:
-        $(Q)$(MAKE) $(dtbinst)=$(boot)/dts
-
 PHONY += vdso_install
 vdso_install:
         $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@
@@ -145,7 +133,6 @@ vdso_install:
 # We use MRPROPER_FILES and CLEAN_FILES now
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
-        $(Q)$(MAKE) $(clean)=$(boot)/dts
 
 # We need to generate vdso-offsets.h before compiling certain files in kernel/.
 # In order to do that, we should use the archprepare target, but we can't since
@@ -160,8 +147,6 @@ vdso_prepare: prepare0
 define archhelp
   echo  '* Image.gz      - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'
   echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
-  echo  '* dtbs          - Build device tree blobs for enabled boards'
-  echo  '  dtbs_install  - Install dtbs to $(INSTALL_DTBS_PATH)'
   echo  '  install       - Install uncompressed kernel'
   echo  '  zinstall      - Install compressed kernel'
   echo  '                  Install using (your) ~/bin/installkernel or'
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 25fcd22a4bb2..96b8f2f51ab2 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -602,7 +602,7 @@ static void __init of_parse_and_init_cpus(void)
 {
         struct device_node *dn;
 
-        for_each_node_by_type(dn, "cpu") {
+        for_each_of_cpu_node(dn) {
                 u64 hwid = of_get_cpu_mpidr(dn);
 
                 if (hwid == INVALID_HWID)
diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile
index 3fe8a948e94c..b7aa854f7008 100644
--- a/arch/c6x/Makefile
+++ b/arch/c6x/Makefile
@@ -40,9 +40,7 @@ boot := arch/$(ARCH)/boot
 DTB:=$(subst dtbImage.,,$(filter dtbImage.%, $(MAKECMDGOALS)))
 export DTB
 
-ifneq ($(DTB),)
 core-y  += $(boot)/dts/
-endif
 
 # With make 3.82 we cannot mix normal and wildcard targets
 
diff --git a/arch/c6x/boot/dts/Makefile b/arch/c6x/boot/dts/Makefile
index b212d278ebc4..f438285c3640 100644
--- a/arch/c6x/boot/dts/Makefile
+++ b/arch/c6x/boot/dts/Makefile
@@ -5,15 +5,12 @@
 
 DTC_FLAGS ?= -p 1024
 
+dtb-$(CONFIG_SOC_TMS320C6455) += dsk6455.dtb
+dtb-$(CONFIG_SOC_TMS320C6457) += evmc6457.dtb
+dtb-$(CONFIG_SOC_TMS320C6472) += evmc6472.dtb
+dtb-$(CONFIG_SOC_TMS320C6474) += evmc6474.dtb
+dtb-$(CONFIG_SOC_TMS320C6678) += evmc6678.dtb
+
 ifneq ($(DTB),)
-obj-y += linked_dtb.o
+obj-y += $(DTB).dtb.o
 endif
-
-quiet_cmd_cp = CP      $< $@$2
-        cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)
-
-# Generate builtin.dtb from $(DTB).dtb
-$(obj)/builtin.dtb: $(obj)/$(DTB).dtb
-        $(call if_changed,cp)
-
-$(obj)/linked_dtb.o: $(obj)/builtin.dtb
diff --git a/arch/c6x/boot/dts/linked_dtb.S b/arch/c6x/boot/dts/linked_dtb.S
deleted file mode 100644
index cf347f1d16ce..000000000000
--- a/arch/c6x/boot/dts/linked_dtb.S
+++ /dev/null
@@ -1,2 +0,0 @@
-.section __fdt_blob,"a"
-.incbin "arch/c6x/boot/dts/builtin.dtb"
diff --git a/arch/c6x/include/asm/sections.h b/arch/c6x/include/asm/sections.h
index d6c591ab5b7e..dc2f15eb3bde 100644
--- a/arch/c6x/include/asm/sections.h
+++ b/arch/c6x/include/asm/sections.h
@@ -8,6 +8,5 @@ extern char _vectors_start[];
 extern char _vectors_end[];
 
 extern char _data_lma[];
-extern char _fdt_start[], _fdt_end[];
 
 #endif /* _ASM_C6X_SECTIONS_H */
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index 786e36e2f61d..05d96a9541b5 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -96,7 +96,7 @@ static void __init get_cpuinfo(void)
         unsigned long core_khz;
         u64 tmp;
         struct cpuinfo_c6x *p;
-        struct device_node *node, *np;
+        struct device_node *node;
 
         p = &per_cpu(cpu_data, smp_processor_id());
 
@@ -190,13 +190,8 @@ static void __init get_cpuinfo(void)
 
         p->core_id = get_coreid();
 
-        node = of_find_node_by_name(NULL, "cpus");
-        if (node) {
-                for_each_child_of_node(node, np)
-                        if (!strcmp("cpu", np->name))
-                                ++c6x_num_cores;
-                of_node_put(node);
-        }
+        for_each_of_cpu_node(node)
+                ++c6x_num_cores;
 
         node = of_find_node_by_name(NULL, "soc");
         if (node) {
@@ -270,7 +265,7 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size)
 notrace void __init machine_init(unsigned long dt_ptr)
 {
         void *dtb = __va(dt_ptr);
-        void *fdt = _fdt_start;
+        void *fdt = __dtb_start;
 
         /* interrupts must be masked */
         set_creg(IER, 2);
@@ -363,7 +358,7 @@ void __init setup_arch(char **cmdline_p)
                                          memory_end >> PAGE_SHIFT);
         memblock_reserve(memory_start, bootmap_size);
 
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 
         c6x_cache_init();
 
diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S
index 1fba5b421eee..584bab2bace6 100644
--- a/arch/c6x/kernel/vmlinux.lds.S
+++ b/arch/c6x/kernel/vmlinux.lds.S
@@ -90,16 +90,6 @@ SECTIONS
                 *(.switch)
         }
 
-        . = ALIGN (8) ;
-        __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET)
-        {
-                _fdt_start = . ;        /* place for fdt blob */
-                *(__fdt_blob) ;         /* Any link-placed DTB */
-                BYTE(0);                /* section always has contents */
-                . = _fdt_start + 0x4000;        /* Pad up to 16kbyte */
-                _fdt_end = . ;
-        }
-
         _etext = .;
 
         /*
diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index 58634e6bae92..4003ddc616e1 100644
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -31,21 +31,12 @@ CROSS_COMPILE := h8300-unknown-linux-
 endif
 
 core-y  += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/
-ifneq '$(CONFIG_H8300_BUILTIN_DTB)' '""'
-core-y += arch/h8300/boot/dts/
-endif
+core-y  += arch/$(ARCH)/boot/dts/
 
 libs-y  += arch/$(ARCH)/lib/
 
 boot := arch/h8300/boot
 
-%.dtb %.dtb.S %.dtb.o: | scripts
-        $(Q)$(MAKE) $(build)=arch/h8300/boot/dts arch/h8300/boot/dts/$@
-
-PHONY += dtbs
-dtbs: scripts
-        $(Q)$(MAKE) $(build)=arch/h8300/boot/dts
-
 archmrproper:
 
 archclean:
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 4f3ab5707265..0823d291fbeb 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -65,9 +65,7 @@ boot := arch/microblaze/boot
 # Are we making a simpleImage.<boardname> target? If so, crack out the boardname
 DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS)))
 
-ifneq ($(DTB),)
-        core-y  += $(boot)/dts/
-endif
+core-y  += $(boot)/dts/
 
 # defines filename extension depending memory management type
 ifeq ($(CONFIG_MMU),)
diff --git a/arch/microblaze/boot/dts/Makefile b/arch/microblaze/boot/dts/Makefile
index 1f77913d404d..c7324e74f9ef 100644
--- a/arch/microblaze/boot/dts/Makefile
+++ b/arch/microblaze/boot/dts/Makefile
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
 #
 
+dtb-y := system.dtb
+
+ifneq ($(DTB),)
 obj-y += linked_dtb.o
 
 # Ensure system.dtb exists
@@ -11,6 +14,7 @@ ifneq ($(DTB),system)
 $(obj)/system.dtb: $(obj)/$(DTB).dtb
         $(call if_changed,cp)
 endif
+endif
 
 quiet_cmd_cp = CP      $< $@$2
         cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c
index 96b3f26d16be..ef2f49471a2a 100644
--- a/arch/microblaze/kernel/cpu/cpuinfo.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo.c
@@ -89,9 +89,9 @@ static struct device_node *cpu;
 
 void __init setup_cpuinfo(void)
 {
-        cpu = (struct device_node *) of_find_node_by_type(NULL, "cpu");
+        cpu = of_get_cpu_node(0, NULL);
         if (!cpu)
-                pr_err("You don't have cpu!!!\n");
+                pr_err("You don't have cpu or are missing cpu reg property!!!\n");
 
         pr_info("%s: initialising\n", __func__);
 
@@ -117,6 +117,8 @@ void __init setup_cpuinfo(void)
         if (cpuinfo.mmu_privins)
                 pr_warn("%s: Stream instructions enabled"
                         " - USERSPACE CAN LOCK THIS KERNEL!\n", __func__);
+
+        of_node_put(cpu);
 }
 
 void __init setup_cpuinfo_clk(void)
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index d74b3742fa5d..d43eeaa6d75b 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -407,18 +407,7 @@ endif
 CLEAN_FILES += vmlinux.32 vmlinux.64
 
 # device-trees
-core-$(CONFIG_BUILTIN_DTB) += arch/mips/boot/dts/
-
-%.dtb %.dtb.S %.dtb.o: | scripts
-        $(Q)$(MAKE) $(build)=arch/mips/boot/dts arch/mips/boot/dts/$@
-
-PHONY += dtbs
-dtbs: scripts
-        $(Q)$(MAKE) $(build)=arch/mips/boot/dts
-
-PHONY += dtbs_install
-dtbs_install:
-        $(Q)$(MAKE) $(dtbinst)=arch/mips/boot/dts
+core-y += arch/mips/boot/dts/
 
 archprepare:
 ifdef CONFIG_MIPS32_N32
@@ -461,8 +450,6 @@ define archhelp
         echo '  uImage.lzma          - U-Boot image (lzma)'
         echo '  uImage.lzo           - U-Boot image (lzo)'
         echo '  uzImage.bin          - U-Boot image (self-extracting)'
-        echo '  dtbs                 - Device-tree blobs for enabled boards'
-        echo '  dtbs_install         - Install dtbs to $(INSTALL_DTBS_PATH)'
         echo
         echo '  These will be default as appropriate for a configured platform.'
         echo
diff --git a/arch/nds32/Makefile b/arch/nds32/Makefile
index 3509fac10491..9f525ed70049 100644
--- a/arch/nds32/Makefile
+++ b/arch/nds32/Makefile
@@ -47,7 +47,7 @@ CHECKFLAGS      += -D__NDS32_EB__
 endif
 
 boot := arch/nds32/boot
-core-$(BUILTIN_DTB) += $(boot)/dts/
+core-y += $(boot)/dts/
 
 .PHONY: FORCE
 
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
index 8673a79dca9c..52c03e60b114 100644
--- a/arch/nios2/Makefile
+++ b/arch/nios2/Makefile
@@ -49,21 +49,13 @@ BOOT_TARGETS = vmImage zImage
 PHONY += $(BOOT_TARGETS) install
 KBUILD_IMAGE := $(nios2-boot)/vmImage
 
-ifneq ($(CONFIG_NIOS2_DTB_SOURCE),"")
-        core-y  += $(nios2-boot)/
-endif
+core-y  += $(nios2-boot)/dts/
 
 all: vmImage
 
 archclean:
         $(Q)$(MAKE) $(clean)=$(nios2-boot)
 
-%.dtb: | scripts
-        $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
-
-dtbs:
-        $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
-
 $(BOOT_TARGETS): vmlinux
         $(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
 
@@ -76,5 +68,4 @@ define archhelp
   echo  '                     (your) ~/bin/$(INSTALLKERNEL) or'
   echo  '                     (distribution) /sbin/$(INSTALLKERNEL) or'
   echo  '                     install to $$(INSTALL_PATH)'
-  echo  '  dtbs            - Build device tree blobs for enabled boards'
 endef
diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile
index 2ba23a679732..37dfc7e584bc 100644
--- a/arch/nios2/boot/Makefile
+++ b/arch/nios2/boot/Makefile
@@ -31,27 +31,5 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
 $(obj)/compressed/vmlinux: $(obj)/vmlinux.gz FORCE
         $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
-# Rule to build device tree blobs
-DTB_SRC := $(patsubst "%",%,$(CONFIG_NIOS2_DTB_SOURCE))
-
-# Make sure the generated dtb gets removed during clean
-extra-$(CONFIG_NIOS2_DTB_SOURCE_BOOL) += system.dtb
-
-$(obj)/system.dtb: $(DTB_SRC) FORCE
-        $(call cmd,dtc)
-
-# Ensure system.dtb exists
-$(obj)/linked_dtb.o: $(obj)/system.dtb
-
-obj-$(CONFIG_NIOS2_DTB_SOURCE_BOOL) += linked_dtb.o
-
-targets += $(dtb-y)
-
-# Rule to build device tree blobs with make command
-$(obj)/%.dtb: $(src)/dts/%.dts FORCE
-        $(call if_changed_dep,dtc)
-
-$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
-
 install:
         sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
diff --git a/arch/nios2/boot/dts/Makefile b/arch/nios2/boot/dts/Makefile
new file mode 100644
index 000000000000..a91a0b09be63
--- /dev/null
+++ b/arch/nios2/boot/dts/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y := $(patsubst "%.dts",%.dtb.o,$(CONFIG_NIOS2_DTB_SOURCE))
+
+dtstree         := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
diff --git a/arch/nios2/boot/linked_dtb.S b/arch/nios2/boot/linked_dtb.S
deleted file mode 100644
index 071f922db338..000000000000
--- a/arch/nios2/boot/linked_dtb.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2011 Thomas Chou <thomas@wytron.com.tw>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-.section .dtb.init.rodata,"a"
-.incbin "arch/nios2/boot/system.dtb"
diff --git a/arch/nios2/kernel/cpuinfo.c b/arch/nios2/kernel/cpuinfo.c
index 93207718bb22..ccc1d2a15a0a 100644
--- a/arch/nios2/kernel/cpuinfo.c
+++ b/arch/nios2/kernel/cpuinfo.c
@@ -47,7 +47,7 @@ void __init setup_cpuinfo(void)
         const char *str;
         int len;
 
-        cpu = of_find_node_by_type(NULL, "cpu");
+        cpu = of_get_cpu_node(0, NULL);
         if (!cpu)
                 panic("%s: No CPU found in devicetree!\n", __func__);
 
@@ -120,6 +120,8 @@ void __init setup_cpuinfo(void)
         cpuinfo.reset_addr = fcpu(cpu, "altr,reset-addr");
         cpuinfo.exception_addr = fcpu(cpu, "altr,exception-addr");
         cpuinfo.fast_tlb_miss_exc_addr = fcpu(cpu, "altr,fast-tlb-miss-addr");
+
+        of_node_put(cpu);
 }
 
 #ifdef CONFIG_PROC_FS
diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c
index ab88b6dd4679..54467d0085a1 100644
--- a/arch/nios2/kernel/time.c
+++ b/arch/nios2/kernel/time.c
@@ -214,12 +214,12 @@ static int __init nios2_timer_get_base_and_freq(struct device_node *np,
 {
         *base = of_iomap(np, 0);
         if (!*base) {
-                pr_crit("Unable to map reg for %s\n", np->name);
+                pr_crit("Unable to map reg for %pOFn\n", np);
                 return -ENXIO;
         }
 
         if (of_property_read_u32(np, "clock-frequency", freq)) {
-                pr_crit("Unable to get %s clock frequency\n", np->name);
+                pr_crit("Unable to get %pOFn clock frequency\n", np);
                 return -EINVAL;
         }
 
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 9d28ab14d139..e17fcd83120f 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -158,9 +158,8 @@ static struct device_node *setup_find_cpu_node(int cpu)
 {
         u32 hwid;
         struct device_node *cpun;
-        struct device_node *cpus = of_find_node_by_path("/cpus");
 
-        for_each_available_child_of_node(cpus, cpun) {
+        for_each_of_cpu_node(cpun) {
                 if (of_property_read_u32(cpun, "reg", &hwid))
                         continue;
                 if (hwid == cpu)
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 11a1acba164a..42f225f6ec93 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -293,9 +293,6 @@ $(BOOT_TARGETS2): vmlinux
 bootwrapper_install:
         $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
 
-%.dtb: scripts
-        $(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
-
 # Used to create 'merged defconfigs'
 # To use it $(call) it with the first argument as the base defconfig
 # and the second argument as a space separated list of .config files to merge,
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 0fb96c26136f..bca5c23767df 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -304,9 +304,9 @@ image-$(CONFIG_PPC_ADDER875)		+= cuImage.adder875-uboot \
                                            dtbImage.adder875-redboot
 
 # Board ports in arch/powerpc/platform/52xx/Kconfig
-image-$(CONFIG_PPC_LITE5200)            += cuImage.lite5200 lite5200.dtb
-image-$(CONFIG_PPC_LITE5200)            += cuImage.lite5200b lite5200b.dtb
-image-$(CONFIG_PPC_MEDIA5200)           += cuImage.media5200 media5200.dtb
+image-$(CONFIG_PPC_LITE5200)            += cuImage.lite5200
+image-$(CONFIG_PPC_LITE5200)            += cuImage.lite5200b
+image-$(CONFIG_PPC_MEDIA5200)           += cuImage.media5200
 
 # Board ports in arch/powerpc/platform/82xx/Kconfig
 image-$(CONFIG_MPC8272_ADS)             += cuImage.mpc8272ads
@@ -381,11 +381,11 @@ $(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperb
         $(call if_changed,wrap,$(subst $(obj)/zImage.,,$@))
 
 # dtbImage% - a dtbImage is a zImage with an embedded device tree blob
-$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE
-        $(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/dts/%.dtb FORCE
+        $(call if_changed,wrap,$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
 
-$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb FORCE
-        $(call if_changed,wrap,$*,,$(obj)/$*.dtb)
+$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/dts/%.dtb FORCE
+        $(call if_changed,wrap,$*,,$(obj)/dts/$*.dtb)
 
 # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
 # prefix
@@ -395,36 +395,33 @@ $(obj)/vmlinux.strip: vmlinux
 $(obj)/uImage: vmlinux $(wrapperbits) FORCE
         $(call if_changed,wrap,uboot)
 
-$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+$(obj)/uImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
 
-$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb)
+$(obj)/uImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,uboot-$*,,$(obj)/dts/$*.dtb)
 
-$(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+$(obj)/cuImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
 
-$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
+$(obj)/cuImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,cuboot-$*,,$(obj)/dts/$*.dtb)
 
-$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+$(obj)/simpleImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,simpleboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
 
-$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)
+$(obj)/simpleImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,simpleboot-$*,,$(obj)/dts/$*.dtb)
 
-$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+$(obj)/treeImage.initrd.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,treeboot-$*,,$(obj)/dts/$*.dtb,$(obj)/ramdisk.image.gz)
 
-$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) FORCE
-        $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
+$(obj)/treeImage.%: vmlinux $(obj)/dts/%.dtb $(wrapperbits) FORCE
+        $(call if_changed,wrap,treeboot-$*,,$(obj)/dts/$*.dtb)
 
-# Rule to build device tree blobs
-$(obj)/%.dtb: $(src)/dts/%.dts FORCE
-        $(call if_changed_dep,dtc)
-
-$(obj)/%.dtb: $(src)/dts/fsl/%.dts FORCE
-        $(call if_changed_dep,dtc)
+# Needed for the above targets to work with dts/fsl/ files
+$(obj)/dts/%.dtb: $(obj)/dts/fsl/%.dtb
+        @cp $< $@
 
 # If there isn't a platform selected then just strip the vmlinux.
 ifeq (,$(image-y))
diff --git a/arch/powerpc/boot/dts/Makefile b/arch/powerpc/boot/dts/Makefile
new file mode 100644
index 000000000000..fb335d05aae8
--- /dev/null
+++ b/arch/powerpc/boot/dts/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+
+subdir-y += fsl
+
+dtstree         := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
diff --git a/arch/powerpc/boot/dts/fsl/Makefile b/arch/powerpc/boot/dts/fsl/Makefile
new file mode 100644
index 000000000000..3bae982641e9
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+
+dtstree         := $(srctree)/$(src)
+dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h
index 2a0c8b1bf147..2abc8e83b95e 100644
--- a/arch/powerpc/boot/libfdt_env.h
+++ b/arch/powerpc/boot/libfdt_env.h
@@ -5,6 +5,8 @@
 #include <types.h>
 #include <string.h>
 
+#define INT_MAX                 ((int)(~0U>>1))
+
 #include "of.h"
 
 typedef unsigned long uintptr_t;
diff --git a/arch/powerpc/platforms/4xx/soc.c b/arch/powerpc/platforms/4xx/soc.c
index 5e36508b2a70..1844bf502fcf 100644
--- a/arch/powerpc/platforms/4xx/soc.c
+++ b/arch/powerpc/platforms/4xx/soc.c
@@ -200,7 +200,7 @@ void ppc4xx_reset_system(char *cmd)
         u32 reset_type = DBCR0_RST_SYSTEM;
         const u32 *prop;
 
-        np = of_find_node_by_type(NULL, "cpu");
+        np = of_get_cpu_node(0, NULL);
         if (np) {
                 prop = of_get_property(np, "reset-type", NULL);
 
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 027c42d8966c..f1c805c8adbc 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -66,7 +66,7 @@ static int __init get_freq(char *name, unsigned long *val)
         int found = 0;
 
         /* The cpu node should have timebase and clock frequency properties */
-        cpu = of_find_node_by_type(NULL, "cpu");
+        cpu = of_get_cpu_node(0, NULL);
 
         if (cpu) {
                 fp = of_get_property(cpu, name, NULL);
@@ -147,8 +147,9 @@ void __init mpc8xx_calibrate_decr(void)
          * we have to enable the timebase).  The decrementer interrupt
          * is wired into the vector table, nothing to do here for that.
          */
-        cpu = of_find_node_by_type(NULL, "cpu");
+        cpu = of_get_cpu_node(0, NULL);
         virq= irq_of_parse_and_map(cpu, 0);
+        of_node_put(cpu);
         irq = virq_to_hw(virq);
 
         sys_tmr2 = immr_map(im_sit);
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 4eb8cb38fc69..ed2f54b3f173 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -1049,7 +1049,6 @@ core99_reset_cpu(struct device_node *node, long param, long value)
         unsigned long flags;
         struct macio_chip *macio;
         struct device_node *np;
-        struct device_node *cpus;
         const int dflt_reset_lines[] = {        KL_GPIO_RESET_CPU0,
                                                 KL_GPIO_RESET_CPU1,
                                                 KL_GPIO_RESET_CPU2,
@@ -1059,10 +1058,7 @@ core99_reset_cpu(struct device_node *node, long param, long value)
         if (macio->type != macio_keylargo)
                 return -ENODEV;
 
-        cpus = of_find_node_by_path("/cpus");
-        if (cpus == NULL)
-                return -ENODEV;
-        for (np = cpus->child; np != NULL; np = np->sibling) {
+        for_each_of_cpu_node(np) {
                 const u32 *num = of_get_property(np, "reg", NULL);
                 const u32 *rst = of_get_property(np, "soft-reset", NULL);
                 if (num == NULL || rst == NULL)
@@ -1072,7 +1068,6 @@ core99_reset_cpu(struct device_node *node, long param, long value)
                         break;
                 }
         }
-        of_node_put(cpus);
         if (np == NULL || reset_io == 0)
                 reset_io = dflt_reset_lines[param];
 
@@ -1504,16 +1499,12 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
         unsigned long flags;
         struct macio_chip *macio;
         struct device_node *np;
-        struct device_node *cpus;
 
         macio = &macio_chips[0];
         if (macio->type != macio_keylargo2 && macio->type != macio_shasta)
                 return -ENODEV;
 
-        cpus = of_find_node_by_path("/cpus");
-        if (cpus == NULL)
-                return -ENODEV;
-        for (np = cpus->child; np != NULL; np = np->sibling) {
+        for_each_of_cpu_node(np) {
                 const u32 *num = of_get_property(np, "reg", NULL);
                 const u32 *rst = of_get_property(np, "soft-reset", NULL);
                 if (num == NULL || rst == NULL)
@@ -1523,7 +1514,6 @@ static long g5_reset_cpu(struct device_node *node, long param, long value)
                         break;
                 }
         }
-        of_node_put(cpus);
         if (np == NULL || reset_io == 0)
                 return -ENODEV;
 
@@ -2515,31 +2505,26 @@ found:
          * supposed to be set when not supported, but I'm not very confident
          * that all Apple OF revs did it properly, I do it the paranoid way.
          */
-        while (uninorth_base && uninorth_rev > 3) {
-                struct device_node *cpus = of_find_node_by_path("/cpus");
+        if (uninorth_base && uninorth_rev > 3) {
                 struct device_node *np;
 
-                if (!cpus || !cpus->child) {
-                        printk(KERN_WARNING "Can't find CPU(s) in device tree !\n");
-                        of_node_put(cpus);
-                        break;
-                }
-                np = cpus->child;
-                /* Nap mode not supported on SMP */
-                if (np->sibling) {
-                        of_node_put(cpus);
-                        break;
-                }
-                /* Nap mode not supported if flush-on-lock property is present */
-                if (of_get_property(np, "flush-on-lock", NULL)) {
-                        of_node_put(cpus);
-                        break;
+                for_each_of_cpu_node(np) {
+                        int cpu_count = 1;
+
+                        /* Nap mode not supported on SMP */
+                        if (of_get_property(np, "flush-on-lock", NULL) ||
+                            (cpu_count > 1)) {
+                                powersave_nap = 0;
+                                of_node_put(np);
+                                break;
+                        }
+
+                        cpu_count++;
+                        powersave_nap = 1;
                 }
-                of_node_put(cpus);
-                powersave_nap = 1;
-                printk(KERN_DEBUG "Processor NAP mode on idle enabled.\n");
-                break;
         }
+        if (powersave_nap)
+                printk(KERN_DEBUG "Processor NAP mode on idle enabled.\n");
 
         /* On CPUs that support it (750FX), lowspeed by default during
          * NAP mode
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 3a529fcdae97..2f00e3daafb0 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -243,10 +243,9 @@ static void __init l2cr_init(void)
 {
         /* Checks "l2cr-value" property in the registry */
         if (cpu_has_feature(CPU_FTR_L2CR)) {
-                struct device_node *np = of_find_node_by_name(NULL, "cpus");
-                if (!np)
-                        np = of_find_node_by_type(NULL, "cpu");
-                if (np) {
+                struct device_node *np;
+
+                for_each_of_cpu_node(np) {
                         const unsigned int *l2cr =
                                 of_get_property(np, "l2cr-value", NULL);
                         if (l2cr) {
@@ -256,6 +255,7 @@ static void __init l2cr_init(void)
                                 _set_L2CR(ppc_override_l2cr_value);
                         }
                         of_node_put(np);
+                        break;
                 }
         }
 
@@ -279,8 +279,8 @@ static void __init pmac_setup_arch(void)
         /* Set loops_per_jiffy to a half-way reasonable value,
            for use until calibrate_delay gets called. */
         loops_per_jiffy = 50000000 / HZ;
-        cpu = of_find_node_by_type(NULL, "cpu");
-        if (cpu != NULL) {
+
+        for_each_of_cpu_node(cpu) {
                 fp = of_get_property(cpu, "clock-frequency", NULL);
                 if (fp != NULL) {
                         if (pvr >= 0x30 && pvr < 0x80)
@@ -292,8 +292,9 @@ static void __init pmac_setup_arch(void)
                         else
                                 /* 601, 603, etc. */
                                 loops_per_jiffy = *fp / (2 * HZ);
+                        of_node_put(cpu);
+                        break;
                 }
-                of_node_put(cpu);
         }
 
         /* See if newworld or oldworld */
diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c
index 26789ad28193..cde370cad4ae 100644
--- a/arch/sh/boards/of-generic.c
+++ b/arch/sh/boards/of-generic.c
@@ -64,7 +64,7 @@ static void sh_of_smp_probe(void)
 
         init_cpu_possible(cpumask_of(0));
 
-        for_each_node_by_type(np, "cpu") {
+        for_each_of_cpu_node(np) {
                 const __be32 *cell = of_get_property(np, "reg", NULL);
                 u64 id = -1;
                 if (cell) id = of_read_number(cell, of_n_addr_cells(np));
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h
index d955c8df62d6..1902db27ff4b 100644
--- a/arch/sparc/include/asm/prom.h
+++ b/arch/sparc/include/asm/prom.h
@@ -24,9 +24,6 @@
 #include <linux/atomic.h>
 #include <linux/irqdomain.h>
 
-#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 2
-#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1
-
 #define of_compat_cmp(s1, s2, l)        strncmp((s1), (s2), (l))
 #define of_prop_cmp(s1, s2)             strcasecmp((s1), (s2))
 #define of_node_cmp(s1, s2)             strcmp((s1), (s2))
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index f39f3a06c26f..7299dcbf8e85 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -140,7 +140,7 @@ static void __init dtb_cpu_setup(void)
         int ret;
 
         version = GET_APIC_VERSION(apic_read(APIC_LVR));
-        for_each_node_by_type(dn, "cpu") {
+        for_each_of_cpu_node(dn) {
                 ret = of_property_read_u32(dn, "reg", &apic_id);
                 if (ret < 0) {
                         pr_warn("%pOF: missing local APIC ID\n", dn);
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index d67e30faff9c..be060dfb1cc3 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -80,28 +80,18 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 head-y          := arch/xtensa/kernel/head.o
 core-y          += arch/xtensa/kernel/ arch/xtensa/mm/
 core-y          += $(buildvar) $(buildplf)
+core-y          += arch/xtensa/boot/dts/
 
 libs-y          += arch/xtensa/lib/ $(LIBGCC)
 drivers-$(CONFIG_OPROFILE)      += arch/xtensa/oprofile/
 
-ifneq ($(CONFIG_BUILTIN_DTB),"")
-core-$(CONFIG_OF) += arch/xtensa/boot/dts/
-endif
-
 boot            := arch/xtensa/boot
 
 all Image zImage uImage: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $@
 
-%.dtb:
-        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
-
-dtbs: scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts
-
 define archhelp
   @echo '* Image       - Kernel ELF image with reset vector'
   @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
   @echo '* uImage      - U-Boot wrapped image'
-  @echo '  dtbs        - Build device tree blobs for enabled boards'
 endef
diff --git a/arch/xtensa/platforms/xtfpga/setup.c b/arch/xtensa/platforms/xtfpga/setup.c
index 42285f35d313..820e8738af11 100644
--- a/arch/xtensa/platforms/xtfpga/setup.c
+++ b/arch/xtensa/platforms/xtfpga/setup.c
@@ -94,7 +94,7 @@ static void __init xtfpga_clk_setup(struct device_node *np)
         u32 freq;
 
         if (!base) {
-                pr_err("%s: invalid address\n", np->name);
+                pr_err("%pOFn: invalid address\n", np);
                 return;
         }
 
@@ -103,12 +103,12 @@ static void __init xtfpga_clk_setup(struct device_node *np)
         clk = clk_register_fixed_rate(NULL, np->name, NULL, 0, freq);
 
         if (IS_ERR(clk)) {
-                pr_err("%s: clk registration failed\n", np->name);
+                pr_err("%pOFn: clk registration failed\n", np);
                 return;
         }
 
         if (of_clk_add_provider(np, of_clk_src_simple_get, clk)) {
-                pr_err("%s: clk provider registration failed\n", np->name);
+                pr_err("%pOFn: clk provider registration failed\n", np);
                 return;
         }
 }
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 439ba5c23693..f0404c6d1ff4 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -706,8 +706,8 @@ static int parse_mc_ranges(struct device *dev,
         *ranges_start = of_get_property(mc_node, "ranges", &ranges_len);
         if (!(*ranges_start) || !ranges_len) {
                 dev_warn(dev,
-                         "missing or empty ranges property for device tree node '%s'\n",
-                         mc_node->name);
+                         "missing or empty ranges property for device tree node '%pOFn'\n",
+                         mc_node);
                 return 0;
         }
 
@@ -730,7 +730,7 @@ static int parse_mc_ranges(struct device *dev,
 
         tuple_len = range_tuple_cell_count * sizeof(__be32);
         if (ranges_len % tuple_len != 0) {
-                dev_err(dev, "malformed ranges property '%s'\n", mc_node->name);
+                dev_err(dev, "malformed ranges property '%pOFn'\n", mc_node);
                 return -EINVAL;
         }
 
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 70db4d5638a6..5b2a11a88951 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -1229,7 +1229,7 @@ mbus_parse_ranges(struct device_node *node,
         tuple_len = (*cell_count) * sizeof(__be32);
 
         if (ranges_len % tuple_len) {
-                pr_warn("malformed ranges entry '%s'\n", node->name);
+                pr_warn("malformed ranges entry '%pOFn'\n", node);
                 return -EINVAL;
         }
         return 0;
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 072aa38374ce..3045067448fb 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -183,7 +183,7 @@ static void __init of_cpu_clk_setup(struct device_node *node)
                 pr_warn("%s: pmu-dfs base register not set, dynamic frequency scaling not available\n",
                         __func__);
 
-        for_each_node_by_type(dn, "cpu")
+        for_each_of_cpu_node(dn)
                 ncpus++;
 
         cpuclk = kcalloc(ncpus, sizeof(*cpuclk), GFP_KERNEL);
@@ -194,7 +194,7 @@ static void __init of_cpu_clk_setup(struct device_node *node)
         if (WARN_ON(!clks))
                 goto clks_out;
 
-        for_each_node_by_type(dn, "cpu") {
+        for_each_of_cpu_node(dn) {
                 struct clk_init_data init;
                 struct clk *clk;
                 char *clk_name = kzalloc(5, GFP_KERNEL);
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index 2c98e020df05..3c0881ac9880 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -593,8 +593,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci)
 /******************** CPU err device********************************/
 static u32 cpc925_cpu_mask_disabled(void)
 {
-        struct device_node *cpus;
-        struct device_node *cpunode = NULL;
+        struct device_node *cpunode;
         static u32 mask = 0;
 
         /* use cached value if available */
@@ -603,20 +602,8 @@ static u32 cpc925_cpu_mask_disabled(void)
 
         mask = APIMASK_ADI0 | APIMASK_ADI1;
 
-        cpus = of_find_node_by_path("/cpus");
-        if (cpus == NULL) {
-                cpc925_printk(KERN_DEBUG, "No /cpus node !\n");
-                return 0;
-        }
-
-        while ((cpunode = of_get_next_child(cpus, cpunode)) != NULL) {
+        for_each_of_cpu_node(cpunode) {
                 const u32 *reg = of_get_property(cpunode, "reg", NULL);
-
-                if (strcmp(cpunode->type, "cpu")) {
-                        cpc925_printk(KERN_ERR, "Not a cpu node in /cpus: %s\n", cpunode->name);
-                        continue;
-                }
-
                 if (reg == NULL || *reg > 2) {
                         cpc925_printk(KERN_ERR, "Bad reg value at %pOF\n", cpunode);
                         continue;
@@ -633,9 +620,6 @@ static u32 cpc925_cpu_mask_disabled(void)
                                 "Assuming PI id is equal to CPU MPIC id!\n");
         }
 
-        of_node_put(cpunode);
-        of_node_put(cpus);
-
         return mask;
 }
 
diff --git a/drivers/firmware/scpi_pm_domain.c b/drivers/firmware/scpi_pm_domain.c
index f395dec27113..390aa13391e4 100644
--- a/drivers/firmware/scpi_pm_domain.c
+++ b/drivers/firmware/scpi_pm_domain.c
@@ -121,7 +121,7 @@ static int scpi_pm_domain_probe(struct platform_device *pdev)
 
                 scpi_pd->domain = i;
                 scpi_pd->ops = scpi_ops;
-                sprintf(scpi_pd->name, "%s.%d", np->name, i);
+                sprintf(scpi_pd->name, "%pOFn.%d", np, i);
                 scpi_pd->genpd.name = scpi_pd->name;
                 scpi_pd->genpd.power_off = scpi_pd_power_off;
                 scpi_pd->genpd.power_on = scpi_pd_power_on;
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 2d45d1dd9554..643f5edd68fe 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1446,8 +1446,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
         }
 
         /* The CEC module handles HDMI hotplug detection */
-        cec_np = of_find_compatible_node(np->parent, NULL,
-                                         "mediatek,mt8173-cec");
+        cec_np = of_get_compatible_child(np->parent, "mediatek,mt8173-cec");
         if (!cec_np) {
                 dev_err(dev, "Failed to find CEC node\n");
                 return -EINVAL;
@@ -1457,8 +1456,10 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
         if (!cec_pdev) {
                 dev_err(hdmi->dev, "Waiting for CEC device %pOF\n",
                         cec_np);
+                of_node_put(cec_np);
                 return -EPROBE_DEFER;
         }
+        of_node_put(cec_np);
         hdmi->cec_dev = &cec_pdev->dev;
 
         /*
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index da1363a0c54d..93d70f4a2154 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -633,8 +633,7 @@ static int adreno_get_legacy_pwrlevels(struct device *dev)
         struct device_node *child, *node;
         int ret;
 
-        node = of_find_compatible_node(dev->of_node, NULL,
-                "qcom,gpu-pwrlevels");
+        node = of_get_compatible_child(dev->of_node, "qcom,gpu-pwrlevels");
         if (!node) {
                 dev_err(dev, "Could not find the GPU powerlevels\n");
                 return -ENXIO;
@@ -655,6 +654,8 @@ static int adreno_get_legacy_pwrlevels(struct device *dev)
                         dev_pm_opp_add(dev, val, 0);
         }
 
+        of_node_put(node);
+
         return 0;
 }
 
diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 8540625796a1..1b955aea44dd 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -543,7 +543,7 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)
                 return ~(u32)0;
         }
 
-        for_each_node_by_type(node, "cpu") {
+        for_each_of_cpu_node(node) {
                 prop = of_get_property(node, "reg", &len);
                 for (i = 0; i < len / sizeof(u32); i++) {
                         if (be32_to_cpup(&prop[i]) == vcpu) {
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 35564a8a48f9..a6cbaca37e94 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -341,7 +341,7 @@ static struct device_node *bcmgenet_mii_of_find_mdio(struct bcmgenet_priv *priv)
         if (!compat)
                 return NULL;
 
-        priv->mdio_dn = of_find_compatible_node(dn, NULL, compat);
+        priv->mdio_dn = of_get_compatible_child(dn, compat);
         kfree(compat);
         if (!priv->mdio_dn) {
                 dev_err(kdev, "unable to find MDIO bus node\n");
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index f9a61f90cfbc..0f660af01a4b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -714,8 +714,9 @@ static int get_ephy_nodes(struct stmmac_priv *priv)
                 return -ENODEV;
         }
 
-        mdio_internal = of_find_compatible_node(mdio_mux, NULL,
+        mdio_internal = of_get_compatible_child(mdio_mux,
                                                 "allwinner,sun8i-h3-mdio-internal");
+        of_node_put(mdio_mux);
         if (!mdio_internal) {
                 dev_err(priv->device, "Cannot get internal_mdio node\n");
                 return -ENODEV;
@@ -729,13 +730,20 @@ static int get_ephy_nodes(struct stmmac_priv *priv)
                 gmac->rst_ephy = of_reset_control_get_exclusive(iphynode, NULL);
                 if (IS_ERR(gmac->rst_ephy)) {
                         ret = PTR_ERR(gmac->rst_ephy);
-                        if (ret == -EPROBE_DEFER)
+                        if (ret == -EPROBE_DEFER) {
+                                of_node_put(iphynode);
+                                of_node_put(mdio_internal);
                                 return ret;
+                        }
                         continue;
                 }
                 dev_info(priv->device, "Found internal PHY node\n");
+                of_node_put(iphynode);
+                of_node_put(mdio_internal);
                 return 0;
         }
+
+        of_node_put(mdio_internal);
         return -ENODEV;
 }
 
diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 91162f8e0366..9a22056e8d9e 100644
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -73,10 +73,9 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
         struct device_node *matched_node;
         int ret;
 
-        matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart");
+        matched_node = of_get_compatible_child(node, "marvell,nfc-uart");
         if (!matched_node) {
-                matched_node = of_find_compatible_node(node, NULL,
-                                                       "mrvl,nfc-uart");
+                matched_node = of_get_compatible_child(node, "mrvl,nfc-uart");
                 if (!matched_node)
                         return -ENODEV;
         }
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 90bf7d9fa17b..13ebb16be64e 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -67,6 +67,7 @@ bool of_node_name_eq(const struct device_node *np, const char *name)
 
         return (strlen(name) == len) && (strncmp(node_name, name, len) == 0);
 }
+EXPORT_SYMBOL(of_node_name_eq);
 
 bool of_node_name_prefix(const struct device_node *np, const char *prefix)
 {
@@ -75,6 +76,7 @@ bool of_node_name_prefix(const struct device_node *np, const char *prefix)
 
         return strncmp(kbasename(np->full_name), prefix, strlen(prefix)) == 0;
 }
+EXPORT_SYMBOL(of_node_name_prefix);
 
 int of_n_addr_cells(struct device_node *np)
 {
@@ -330,6 +332,8 @@ 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 && !ac && arch_match_cpu_phys_id(cpu, 0))
+                return true;
         if (!cell || !ac)
                 return false;
         prop_len /= sizeof(*cell) * ac;
@@ -390,7 +394,7 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
 {
         struct device_node *cpun;
 
-        for_each_node_by_type(cpun, "cpu") {
+        for_each_of_cpu_node(cpun) {
                 if (arch_find_n_match_cpu_physical_id(cpun, cpu, thread))
                         return cpun;
         }
@@ -745,6 +749,45 @@ struct device_node *of_get_next_available_child(const struct device_node *node,
 EXPORT_SYMBOL(of_get_next_available_child);
 
 /**
+ *      of_get_next_cpu_node - Iterate on cpu nodes
+ *      @prev:  previous child of the /cpus node, or NULL to get first
+ *
+ *      Returns a cpu node pointer with refcount incremented, use of_node_put()
+ *      on it when done. Returns NULL when prev is the last child. Decrements
+ *      the refcount of prev.
+ */
+struct device_node *of_get_next_cpu_node(struct device_node *prev)
+{
+        struct device_node *next = NULL;
+        unsigned long flags;
+        struct device_node *node;
+
+        if (!prev)
+                node = of_find_node_by_path("/cpus");
+
+        raw_spin_lock_irqsave(&devtree_lock, flags);
+        if (prev)
+                next = prev->sibling;
+        else if (node) {
+                next = node->child;
+                of_node_put(node);
+        }
+        for (; next; next = next->sibling) {
+                if (!(of_node_name_eq(next, "cpu") ||
+                      (next->type && !of_node_cmp(next->type, "cpu"))))
+                        continue;
+                if (!__of_device_is_available(next))
+                        continue;
+                if (of_node_get(next))
+                        break;
+        }
+        of_node_put(prev);
+        raw_spin_unlock_irqrestore(&devtree_lock, flags);
+        return next;
+}
+EXPORT_SYMBOL(of_get_next_cpu_node);
+
+/**
  * of_get_compatible_child - Find compatible child node
  * @parent:     parent node
  * @compatible: compatible string
@@ -2013,7 +2056,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)
         /* OF on pmac has nodes instead of properties named "l2-cache"
          * beneath CPU nodes.
          */
-        if (!strcmp(np->type, "cpu"))
+        if (IS_ENABLED(CONFIG_PPC_PMAC) && !strcmp(np->type, "cpu"))
                 for_each_child_of_node(np, child)
                         if (!strcmp(child->type, "cache"))
                                 return child;
diff --git a/drivers/of/device.c b/drivers/of/device.c
index c7fa5a9697c9..0f27fad9fe94 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -207,7 +207,8 @@ static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len
                 return -ENODEV;
 
         /* Name & Type */
-        csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
+        /* %p eats all alphanum characters, so %c must be used here */
+        csize = snprintf(str, len, "of:N%pOFn%c%s", dev->of_node, 'T',
                          dev->of_node->type);
         tsize = csize;
         len -= csize;
@@ -286,7 +287,7 @@ void of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
         if ((!dev) || (!dev->of_node))
                 return;
 
-        add_uevent_var(env, "OF_NAME=%s", dev->of_node->name);
+        add_uevent_var(env, "OF_NAME=%pOFn", dev->of_node);
         add_uevent_var(env, "OF_FULLNAME=%pOF", dev->of_node);
         if (dev->of_node->type && strcmp("<NULL>", dev->of_node->type) != 0)
                 add_uevent_var(env, "OF_TYPE=%s", dev->of_node->type);
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index e92391d6d1bd..5ad1342f5682 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -97,8 +97,8 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio,
                 return rc;
         }
 
-        dev_dbg(&mdio->dev, "registered phy %s at address %i\n",
-                child->name, addr);
+        dev_dbg(&mdio->dev, "registered phy %pOFn at address %i\n",
+                child, addr);
         return 0;
 }
 
@@ -127,8 +127,8 @@ static int of_mdiobus_register_device(struct mii_bus *mdio,
                 return rc;
         }
 
-        dev_dbg(&mdio->dev, "registered mdio device %s at address %i\n",
-                child->name, addr);
+        dev_dbg(&mdio->dev, "registered mdio device %pOFn at address %i\n",
+                child, addr);
         return 0;
 }
 
@@ -263,8 +263,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                                 continue;
 
                         /* be noisy to encourage people to set reg property */
-                        dev_info(&mdio->dev, "scan phy %s at address %i\n",
-                                 child->name, addr);
+                        dev_info(&mdio->dev, "scan phy %pOFn at address %i\n",
+                                 child, addr);
 
                         if (of_mdiobus_child_is_phy(child)) {
                                 rc = of_mdiobus_register_phy(mdio, child, addr);
diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c
index 27d9b4bba535..35c64a4295e0 100644
--- a/drivers/of/of_numa.c
+++ b/drivers/of/of_numa.c
@@ -24,18 +24,9 @@ static void __init of_numa_parse_cpu_nodes(void)
 {
         u32 nid;
         int r;
-        struct device_node *cpus;
-        struct device_node *np = NULL;
-
-        cpus = of_find_node_by_path("/cpus");
-        if (!cpus)
-                return;
-
-        for_each_child_of_node(cpus, np) {
-                /* Skip things that are not CPUs */
-                if (of_node_cmp(np->type, "cpu") != 0)
-                        continue;
+        struct device_node *np;
 
+        for_each_of_cpu_node(np) {
                 r = of_property_read_u32(np, "numa-node-id", &nid);
                 if (r)
                         continue;
@@ -46,8 +37,6 @@ static void __init of_numa_parse_cpu_nodes(void)
                 else
                         node_set(nid, numa_nodes_parsed);
         }
-
-        of_node_put(cpus);
 }
 
 static int __init of_numa_parse_memory_nodes(void)
@@ -163,8 +152,8 @@ int of_node_to_nid(struct device_node *device)
                 np = of_get_next_parent(np);
         }
         if (np && r)
-                pr_warn("Invalid \"numa-node-id\" property in node %s\n",
-                        np->name);
+                pr_warn("Invalid \"numa-node-id\" property in node %pOFn\n",
+                        np);
         of_node_put(np);
 
         /*
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 216175d11d3d..5d1567025358 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -27,6 +27,14 @@ struct alias_prop {
         char stem[0];
 };
 
+#if defined(CONFIG_SPARC)
+#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 2
+#else
+#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 1
+#endif
+
+#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1
+
 extern struct mutex of_mutex;
 extern struct list_head aliases_lookup;
 extern struct kset *of_kset;
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index eda57ef12fd0..42b1f73ac5f6 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -425,8 +425,8 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs,
         for_each_child_of_node(overlay_node, child) {
                 ret = add_changeset_node(ovcs, target_node, child);
                 if (ret) {
-                        pr_debug("Failed to apply node @%pOF/%s, err=%d\n",
-                                 target_node, child->name, ret);
+                        pr_debug("Failed to apply node @%pOF/%pOFn, err=%d\n",
+                                 target_node, child, ret);
                         of_node_put(child);
                         return ret;
                 }
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 6c59673933e9..04ad312fd85b 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -91,8 +91,8 @@ static void of_device_make_bus_id(struct device *dev)
                  */
                 reg = of_get_property(node, "reg", NULL);
                 if (reg && (addr = of_translate_address(node, reg)) != OF_BAD_ADDR) {
-                        dev_set_name(dev, dev_name(dev) ? "%llx.%s:%s" : "%llx.%s",
-                                     (unsigned long long)addr, node->name,
+                        dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn",
+                                     (unsigned long long)addr, node,
                                      dev_name(dev));
                         return;
                 }
@@ -142,8 +142,8 @@ struct platform_device *of_device_alloc(struct device_node *np,
                         WARN_ON(rc);
                 }
                 if (of_irq_to_resource_table(np, res, num_irq) != num_irq)
-                        pr_debug("not all legacy IRQ resources mapped for %s\n",
-                                 np->name);
+                        pr_debug("not all legacy IRQ resources mapped for %pOFn\n",
+                                 np);
         }
 
         dev->dev.of_node = of_node_get(np);
diff --git a/drivers/of/unittest-data/overlay_15.dts b/drivers/of/unittest-data/overlay_15.dts
index b98f2514df4b..5728490474f6 100644
--- a/drivers/of/unittest-data/overlay_15.dts
+++ b/drivers/of/unittest-data/overlay_15.dts
@@ -20,8 +20,8 @@
                         #size-cells = <0>;
                         reg = <0>;
 
-                        test-mux-dev {
-                                reg = <32>;
+                        test-mux-dev@20 {
+                                reg = <0x20>;
                                 compatible = "unittest-i2c-dev";
                                 status = "okay";
                         };
diff --git a/drivers/of/unittest-data/tests-overlay.dtsi b/drivers/of/unittest-data/tests-overlay.dtsi
index 25cf397b8f6b..4ea024d908ee 100644
--- a/drivers/of/unittest-data/tests-overlay.dtsi
+++ b/drivers/of/unittest-data/tests-overlay.dtsi
@@ -103,8 +103,8 @@
                                                         #size-cells = <0>;
                                                         reg = <0>;
 
-                                                        test-mux-dev {
-                                                                reg = <32>;
+                                                        test-mux-dev@20 {
+                                                                reg = <0x20>;
                                                                 compatible = "unittest-i2c-dev";
                                                                 status = "okay";
                                                         };
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 41b49716ac75..a3a6866765f2 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -212,8 +212,8 @@ static int __init of_unittest_check_node_linkage(struct device_node *np)
 
         for_each_child_of_node(np, child) {
                 if (child->parent != np) {
-                        pr_err("Child node %s links to wrong parent %s\n",
-                                 child->name, np->name);
+                        pr_err("Child node %pOFn links to wrong parent %pOFn\n",
+                                 child, np);
                         rc = -EINVAL;
                         goto put_child;
                 }
@@ -299,6 +299,10 @@ static void __init of_unittest_printf(void)
 
         of_unittest_printf_one(np, "%pOF",  full_name);
         of_unittest_printf_one(np, "%pOFf", full_name);
+        of_unittest_printf_one(np, "%pOFn", "dev");
+        of_unittest_printf_one(np, "%2pOFn", "dev");
+        of_unittest_printf_one(np, "%5pOFn", "  dev");
+        of_unittest_printf_one(np, "%pOFnc", "dev:test-sub-device");
         of_unittest_printf_one(np, "%pOFp", phandle_str);
         of_unittest_printf_one(np, "%pOFP", "dev@100");
         of_unittest_printf_one(np, "ABC %pOFP ABC", "ABC dev@100 ABC");
@@ -1046,16 +1050,16 @@ static void __init of_unittest_platform_populate(void)
         for_each_child_of_node(np, child) {
                 for_each_child_of_node(child, grandchild)
                         unittest(of_find_device_by_node(grandchild),
-                                 "Could not create device for node '%s'\n",
-                                 grandchild->name);
+                                 "Could not create device for node '%pOFn'\n",
+                                 grandchild);
         }
 
         of_platform_depopulate(&test_bus->dev);
         for_each_child_of_node(np, child) {
                 for_each_child_of_node(child, grandchild)
                         unittest(!of_find_device_by_node(grandchild),
-                                 "device didn't get destroyed '%s'\n",
-                                 grandchild->name);
+                                 "device didn't get destroyed '%pOFn'\n",
+                                 grandchild);
         }
 
         platform_device_unregister(test_bus);
@@ -2357,11 +2361,14 @@ static __init void of_unittest_overlay_high_level(void)
                 }
         }
 
-        for (np = overlay_base_root->child; np; np = np->sibling) {
-                if (of_get_child_by_name(of_root, np->name)) {
-                        unittest(0, "illegal node name in overlay_base %s",
-                                np->name);
-                        return;
+        for_each_child_of_node(overlay_base_root, np) {
+                struct device_node *base_child;
+                for_each_child_of_node(of_root, base_child) {
+                        if (!strcmp(np->full_name, base_child->full_name)) {
+                                unittest(0, "illegal node name in overlay_base %pOFn",
+                                         np);
+                                return;
+                        }
                 }
         }
 
diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 80582c8f98fa..0e202d4273fb 100644
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -1022,12 +1022,13 @@ static int twl4030_bci_probe(struct platform_device *pdev)
         if (bci->dev->of_node) {
                 struct device_node *phynode;
 
-                phynode = of_find_compatible_node(bci->dev->of_node->parent,
-                                                  NULL, "ti,twl4030-usb");
+                phynode = of_get_compatible_child(bci->dev->of_node->parent,
+                                                  "ti,twl4030-usb");
                 if (phynode) {
                         bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
                         bci->transceiver = devm_usb_get_phy_by_node(
                                 bci->dev, phynode, &bci->usb_nb);
+                        of_node_put(phynode);
                         if (IS_ERR(bci->transceiver)) {
                                 ret = PTR_ERR(bci->transceiver);
                                 if (ret == -EPROBE_DEFER)
diff --git a/drivers/soc/dove/pmu.c b/drivers/soc/dove/pmu.c
index 5abb08ffb74d..ffc5311c0ed8 100644
--- a/drivers/soc/dove/pmu.c
+++ b/drivers/soc/dove/pmu.c
@@ -383,7 +383,7 @@ int __init dove_init_pmu(void)
 
         domains_node = of_get_child_by_name(np_pmu, "domains");
         if (!domains_node) {
-                pr_err("%s: failed to find domains sub-node\n", np_pmu->name);
+                pr_err("%pOFn: failed to find domains sub-node\n", np_pmu);
                 return 0;
         }
 
@@ -396,7 +396,7 @@ int __init dove_init_pmu(void)
         pmu->pmc_base = of_iomap(pmu->of_node, 0);
         pmu->pmu_base = of_iomap(pmu->of_node, 1);
         if (!pmu->pmc_base || !pmu->pmu_base) {
-                pr_err("%s: failed to map PMU\n", np_pmu->name);
+                pr_err("%pOFn: failed to map PMU\n", np_pmu);
                 iounmap(pmu->pmu_base);
                 iounmap(pmu->pmc_base);
                 kfree(pmu);
@@ -414,7 +414,7 @@ int __init dove_init_pmu(void)
                         break;
 
                 domain->pmu = pmu;
-                domain->base.name = kstrdup(np->name, GFP_KERNEL);
+                domain->base.name = kasprintf(GFP_KERNEL, "%pOFn", np);
                 if (!domain->base.name) {
                         kfree(domain);
                         break;
@@ -444,7 +444,7 @@ int __init dove_init_pmu(void)
         /* Loss of the interrupt controller is not a fatal error. */
         parent_irq = irq_of_parse_and_map(pmu->of_node, 0);
         if (!parent_irq) {
-                pr_err("%s: no interrupt specified\n", np_pmu->name);
+                pr_err("%pOFn: no interrupt specified\n", np_pmu);
         } else {
                 ret = dove_init_pmu_irq(pmu, parent_irq);
                 if (ret)
diff --git a/drivers/soc/fsl/qe/qe_tdm.c b/drivers/soc/fsl/qe/qe_tdm.c
index f744c214f680..f78c34647ca2 100644
--- a/drivers/soc/fsl/qe/qe_tdm.c
+++ b/drivers/soc/fsl/qe/qe_tdm.c
@@ -131,7 +131,7 @@ int ucc_of_parse_tdm(struct device_node *np, struct ucc_tdm *utdm,
 
         pdev = of_find_device_by_node(np2);
         if (!pdev) {
-                pr_err("%s: failed to lookup pdev\n", np2->name);
+                pr_err("%pOFn: failed to lookup pdev\n", np2);
                 of_node_put(np2);
                 return -EINVAL;
         }
@@ -153,7 +153,7 @@ int ucc_of_parse_tdm(struct device_node *np, struct ucc_tdm *utdm,
         pdev = of_find_device_by_node(np2);
         if (!pdev) {
                 ret = -EINVAL;
-                pr_err("%s: failed to lookup pdev\n", np2->name);
+                pr_err("%pOFn: failed to lookup pdev\n", np2);
                 of_node_put(np2);
                 goto err_miss_siram_property;
         }
diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c
index 57af8a537332..4bda793ba6ae 100644
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
@@ -219,7 +219,7 @@ static int apr_add_device(struct device *dev, struct device_node *np,
         adev->domain_id = id->domain_id;
         adev->version = id->svc_version;
         if (np)
-                strncpy(adev->name, np->name, APR_NAME_SIZE);
+                snprintf(adev->name, APR_NAME_SIZE, "%pOFn", np);
         else
                 strncpy(adev->name, id->name, APR_NAME_SIZE);
 
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index 6dff8682155f..6f86a726bb45 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -392,21 +392,21 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
         error = of_property_read_u32(node, "reg", &id);
         if (error) {
                 dev_err(pmu->dev,
-                        "%s: failed to retrieve domain id (reg): %d\n",
-                        node->name, error);
+                        "%pOFn: failed to retrieve domain id (reg): %d\n",
+                        node, error);
                 return -EINVAL;
         }
 
         if (id >= pmu->info->num_domains) {
-                dev_err(pmu->dev, "%s: invalid domain id %d\n",
-                        node->name, id);
+                dev_err(pmu->dev, "%pOFn: invalid domain id %d\n",
+                        node, id);
                 return -EINVAL;
         }
 
         pd_info = &pmu->info->domain_info[id];
         if (!pd_info) {
-                dev_err(pmu->dev, "%s: undefined domain id %d\n",
-                        node->name, id);
+                dev_err(pmu->dev, "%pOFn: undefined domain id %d\n",
+                        node, id);
                 return -EINVAL;
         }
 
@@ -424,8 +424,8 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
                 if (!pd->clks)
                         return -ENOMEM;
         } else {
-                dev_dbg(pmu->dev, "%s: doesn't have clocks: %d\n",
-                        node->name, pd->num_clks);
+                dev_dbg(pmu->dev, "%pOFn: doesn't have clocks: %d\n",
+                        node, pd->num_clks);
                 pd->num_clks = 0;
         }
 
@@ -434,8 +434,8 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
                 if (IS_ERR(pd->clks[i].clk)) {
                         error = PTR_ERR(pd->clks[i].clk);
                         dev_err(pmu->dev,
-                                "%s: failed to get clk at index %d: %d\n",
-                                node->name, i, error);
+                                "%pOFn: failed to get clk at index %d: %d\n",
+                                node, i, error);
                         return error;
                 }
         }
@@ -486,8 +486,8 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
         error = rockchip_pd_power(pd, true);
         if (error) {
                 dev_err(pmu->dev,
-                        "failed to power on domain '%s': %d\n",
-                        node->name, error);
+                        "failed to power on domain '%pOFn': %d\n",
+                        node, error);
                 goto err_unprepare_clocks;
         }
 
@@ -575,24 +575,24 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu,
                 error = of_property_read_u32(parent, "reg", &idx);
                 if (error) {
                         dev_err(pmu->dev,
-                                "%s: failed to retrieve domain id (reg): %d\n",
-                                parent->name, error);
+                                "%pOFn: failed to retrieve domain id (reg): %d\n",
+                                parent, error);
                         goto err_out;
                 }
                 parent_domain = pmu->genpd_data.domains[idx];
 
                 error = rockchip_pm_add_one_domain(pmu, np);
                 if (error) {
-                        dev_err(pmu->dev, "failed to handle node %s: %d\n",
-                                np->name, error);
+                        dev_err(pmu->dev, "failed to handle node %pOFn: %d\n",
+                                np, error);
                         goto err_out;
                 }
 
                 error = of_property_read_u32(np, "reg", &idx);
                 if (error) {
                         dev_err(pmu->dev,
-                                "%s: failed to retrieve domain id (reg): %d\n",
-                                np->name, error);
+                                "%pOFn: failed to retrieve domain id (reg): %d\n",
+                                np, error);
                         goto err_out;
                 }
                 child_domain = pmu->genpd_data.domains[idx];
@@ -683,16 +683,16 @@ static int rockchip_pm_domain_probe(struct platform_device *pdev)
         for_each_available_child_of_node(np, node) {
                 error = rockchip_pm_add_one_domain(pmu, node);
                 if (error) {
-                        dev_err(dev, "failed to handle node %s: %d\n",
-                                node->name, error);
+                        dev_err(dev, "failed to handle node %pOFn: %d\n",
+                                node, error);
                         of_node_put(node);
                         goto err_out;
                 }
 
                 error = rockchip_pm_add_subdomain(pmu, node);
                 if (error < 0) {
-                        dev_err(dev, "failed to handle subdomain node %s: %d\n",
-                                node->name, error);
+                        dev_err(dev, "failed to handle subdomain node %pOFn: %d\n",
+                                node, error);
                         of_node_put(node);
                         goto err_out;
                 }
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
index 2d6f3fcf3211..acbe63e925d5 100644
--- a/drivers/soc/tegra/pmc.c
+++ b/drivers/soc/tegra/pmc.c
@@ -796,7 +796,7 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np)
 
         id = tegra_powergate_lookup(pmc, np->name);
         if (id < 0) {
-                pr_err("powergate lookup failed for %s: %d\n", np->name, id);
+                pr_err("powergate lookup failed for %pOFn: %d\n", np, id);
                 goto free_mem;
         }
 
@@ -816,13 +816,13 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np)
 
         err = tegra_powergate_of_get_clks(pg, np);
         if (err < 0) {
-                pr_err("failed to get clocks for %s: %d\n", np->name, err);
+                pr_err("failed to get clocks for %pOFn: %d\n", np, err);
                 goto set_available;
         }
 
         err = tegra_powergate_of_get_resets(pg, np, off);
         if (err < 0) {
-                pr_err("failed to get resets for %s: %d\n", np->name, err);
+                pr_err("failed to get resets for %pOFn: %d\n", np, err);
                 goto remove_clks;
         }
 
@@ -851,15 +851,15 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np)
 
         err = pm_genpd_init(&pg->genpd, NULL, off);
         if (err < 0) {
-                pr_err("failed to initialise PM domain %s: %d\n", np->name,
+                pr_err("failed to initialise PM domain %pOFn: %d\n", np,
                        err);
                 goto remove_resets;
         }
 
         err = of_genpd_add_provider_simple(np, &pg->genpd);
         if (err < 0) {
-                pr_err("failed to add PM domain provider for %s: %d\n",
-                       np->name, err);
+                pr_err("failed to add PM domain provider for %pOFn: %d\n",
+                       np, err);
                 goto remove_genpd;
         }
 
diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c
index 224d7ddeeb76..bbd4e5bc8707 100644
--- a/drivers/soc/ti/knav_dma.c
+++ b/drivers/soc/ti/knav_dma.c
@@ -544,15 +544,15 @@ static void __iomem *pktdma_get_regs(struct knav_dma_device *dma,
 
         ret = of_address_to_resource(node, index, &res);
         if (ret) {
-                dev_err(dev, "Can't translate of node(%s) address for index(%d)\n",
-                        node->name, index);
+                dev_err(dev, "Can't translate of node(%pOFn) address for index(%d)\n",
+                        node, index);
                 return ERR_PTR(ret);
         }
 
         regs = devm_ioremap_resource(kdev->dev, &res);
         if (IS_ERR(regs))
-                dev_err(dev, "Failed to map register base for index(%d) node(%s)\n",
-                        index, node->name);
+                dev_err(dev, "Failed to map register base for index(%d) node(%pOFn)\n",
+                        index, node);
         if (_size)
                 *_size = resource_size(&res);
 
diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c
index 6755f2af5619..b5d5673c255c 100644
--- a/drivers/soc/ti/knav_qmss_queue.c
+++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -1382,15 +1382,15 @@ static void __iomem *knav_queue_map_reg(struct knav_device *kdev,
 
         ret = of_address_to_resource(node, index, &res);
         if (ret) {
-                dev_err(kdev->dev, "Can't translate of node(%s) address for index(%d)\n",
-                        node->name, index);
+                dev_err(kdev->dev, "Can't translate of node(%pOFn) address for index(%d)\n",
+                        node, index);
                 return ERR_PTR(ret);
         }
 
         regs = devm_ioremap_resource(kdev->dev, &res);
         if (IS_ERR(regs))
-                dev_err(kdev->dev, "Failed to map register base for index(%d) node(%s)\n",
-                        index, node->name);
+                dev_err(kdev->dev, "Failed to map register base for index(%d) node(%pOFn)\n",
+                        index, node);
         return regs;
 }
 
diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c
index bc9eb8afc313..332a56b6811f 100644
--- a/drivers/video/fbdev/fsl-diu-fb.c
+++ b/drivers/video/fbdev/fsl-diu-fb.c
@@ -1925,7 +1925,7 @@ static int __init fsl_diu_init(void)
         pr_info("Freescale Display Interface Unit (DIU) framebuffer driver\n");
 
 #ifdef CONFIG_NOT_COHERENT_CACHE
-        np = of_find_node_by_type(NULL, "cpu");
+        np = of_get_cpu_node(0, NULL);
         if (!np) {
                 pr_err("fsl-diu-fb: can't find 'cpu' device node\n");
                 return -ENODEV;
diff --git a/include/dt-bindings/clock/exynos3250.h b/include/dt-bindings/clock/exynos3250.h
index c796ff02ceeb..fe8214017b46 100644
--- a/include/dt-bindings/clock/exynos3250.h
+++ b/include/dt-bindings/clock/exynos3250.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  *      Author: Tomasz Figa <t.figa@samsung.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.
- *
  * Device Tree binding constants for Samsung Exynos3250 clock controllers.
  */
 
diff --git a/include/dt-bindings/clock/exynos4.h b/include/dt-bindings/clock/exynos4.h
index e9f9d400c322..5b1d68512360 100644
--- a/include/dt-bindings/clock/exynos4.h
+++ b/include/dt-bindings/clock/exynos4.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  * Author: Andrzej Hajda <a.hajda@samsung.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.
- *
  * Device Tree binding constants for Exynos4 clock controller.
-*/
+ */
 
 #ifndef _DT_BINDINGS_CLOCK_EXYNOS_4_H
 #define _DT_BINDINGS_CLOCK_EXYNOS_4_H
diff --git a/include/dt-bindings/clock/exynos5250.h b/include/dt-bindings/clock/exynos5250.h
index 15508adcdfde..bc8a3c53a54b 100644
--- a/include/dt-bindings/clock/exynos5250.h
+++ b/include/dt-bindings/clock/exynos5250.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  * Author: Andrzej Hajda <a.hajda@samsung.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.
- *
  * Device Tree binding constants for Exynos5250 clock controller.
-*/
+ */
 
 #ifndef _DT_BINDINGS_CLOCK_EXYNOS_5250_H
 #define _DT_BINDINGS_CLOCK_EXYNOS_5250_H
diff --git a/include/dt-bindings/clock/exynos5260-clk.h b/include/dt-bindings/clock/exynos5260-clk.h
index a4bac9a1764f..98a58cbd81b2 100644
--- a/include/dt-bindings/clock/exynos5260-clk.h
+++ b/include/dt-bindings/clock/exynos5260-clk.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  * Author: Rahul Sharma <rahul.sharma@samsung.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.
- *
  * Provides Constants for Exynos5260 clocks.
-*/
+ */
 
 #ifndef _DT_BINDINGS_CLK_EXYNOS5260_H
 #define _DT_BINDINGS_CLK_EXYNOS5260_H
diff --git a/include/dt-bindings/clock/exynos5410.h b/include/dt-bindings/clock/exynos5410.h
index 6cb4e90f81fc..f179eabbcdb7 100644
--- a/include/dt-bindings/clock/exynos5410.h
+++ b/include/dt-bindings/clock/exynos5410.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  * Copyright (c) 2016 Krzysztof Kozlowski
  *
- * 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.
- *
  * Device Tree binding constants for Exynos5421 clock controller.
-*/
+ */
 
 #ifndef _DT_BINDINGS_CLOCK_EXYNOS_5410_H
 #define _DT_BINDINGS_CLOCK_EXYNOS_5410_H
diff --git a/include/dt-bindings/clock/exynos5420.h b/include/dt-bindings/clock/exynos5420.h
index 2740ae0424a9..355f469943f1 100644
--- a/include/dt-bindings/clock/exynos5420.h
+++ b/include/dt-bindings/clock/exynos5420.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  * Author: Andrzej Hajda <a.hajda@samsung.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.
- *
  * Device Tree binding constants for Exynos5420 clock controller.
-*/
+ */
 
 #ifndef _DT_BINDINGS_CLOCK_EXYNOS_5420_H
 #define _DT_BINDINGS_CLOCK_EXYNOS_5420_H
diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindings/clock/exynos5433.h
index be39d23e6a32..98bd85ce1e45 100644
--- a/include/dt-bindings/clock/exynos5433.h
+++ b/include/dt-bindings/clock/exynos5433.h
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  * Author: Chanwoo Choi <cw00.choi@samsung.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 _DT_BINDINGS_CLOCK_EXYNOS5433_H
diff --git a/include/dt-bindings/clock/exynos7-clk.h b/include/dt-bindings/clock/exynos7-clk.h
index 10c558611085..fce33c7050c8 100644
--- a/include/dt-bindings/clock/exynos7-clk.h
+++ b/include/dt-bindings/clock/exynos7-clk.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  * Author: Naveen Krishna Ch <naveenkrishna.ch@gmail.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 _DT_BINDINGS_CLOCK_EXYNOS7_H
 #define _DT_BINDINGS_CLOCK_EXYNOS7_H
diff --git a/include/dt-bindings/clock/s3c2410.h b/include/dt-bindings/clock/s3c2410.h
index 352a7673fc69..0fb65c3f2f59 100644
--- a/include/dt-bindings/clock/s3c2410.h
+++ b/include/dt-bindings/clock/s3c2410.h
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>
  *
- * 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.
- *
  * Device Tree binding constants clock controllers of Samsung S3C2410 and later.
  */
 
diff --git a/include/dt-bindings/clock/s3c2412.h b/include/dt-bindings/clock/s3c2412.h
index aac1dcfda81c..b4656156cc0f 100644
--- a/include/dt-bindings/clock/s3c2412.h
+++ b/include/dt-bindings/clock/s3c2412.h
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>
  *
- * 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.
- *
  * Device Tree binding constants clock controllers of Samsung S3C2412.
  */
 
diff --git a/include/dt-bindings/clock/s3c2443.h b/include/dt-bindings/clock/s3c2443.h
index f3ba68a25ecb..a9d2f105d536 100644
--- a/include/dt-bindings/clock/s3c2443.h
+++ b/include/dt-bindings/clock/s3c2443.h
@@ -1,10 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>
  *
- * 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.
- *
  * Device Tree binding constants clock controllers of Samsung S3C2443 and later.
  */
 
diff --git a/include/dt-bindings/interrupt-controller/arm-gic.h b/include/dt-bindings/interrupt-controller/arm-gic.h
index 0c85f65c81c7..35b6f69b7db6 100644
--- a/include/dt-bindings/interrupt-controller/arm-gic.h
+++ b/include/dt-bindings/interrupt-controller/arm-gic.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /*
  * This header provides constants for the ARM GIC.
  */
diff --git a/include/dt-bindings/interrupt-controller/irq.h b/include/dt-bindings/interrupt-controller/irq.h
index a8b310555f14..9e3d183e1381 100644
--- a/include/dt-bindings/interrupt-controller/irq.h
+++ b/include/dt-bindings/interrupt-controller/irq.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /*
  * This header provides constants for most IRQ bindings.
  *
diff --git a/include/dt-bindings/thermal/thermal_exynos.h b/include/dt-bindings/thermal/thermal_exynos.h
index 0646500bca69..642e4e7f4084 100644
--- a/include/dt-bindings/thermal/thermal_exynos.h
+++ b/include/dt-bindings/thermal/thermal_exynos.h
@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * thermal_exynos.h - Samsung EXYNOS TMU device tree definitions
  *
  *  Copyright (C) 2014 Samsung Electronics
  *  Lukasz Majewski <l.majewski@samsung.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #ifndef _EXYNOS_THERMAL_TMU_DT_H
diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h
index c6ac1fe7ec68..edb0f0c30904 100644
--- a/include/linux/libfdt_env.h
+++ b/include/linux/libfdt_env.h
@@ -2,6 +2,7 @@
 #ifndef LIBFDT_ENV_H
 #define LIBFDT_ENV_H
 
+#include <linux/kernel.h>       /* For INT_MAX */
 #include <linux/string.h>
 
 #include <asm/byteorder.h>
diff --git a/include/linux/of.h b/include/linux/of.h
index bf577ca3c8e7..ab96025b2382 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -247,12 +247,6 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 #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)
-#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 1
-#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1
-#endif
-
 #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
 #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
 
@@ -353,6 +347,8 @@ extern const void *of_get_property(const struct device_node *node,
                                 const char *name,
                                 int *lenp);
 extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
+extern struct device_node *of_get_next_cpu_node(struct device_node *prev);
+
 #define for_each_property_of_node(dn, pp) \
         for (pp = dn->properties; pp != NULL; pp = pp->next)
 
@@ -758,6 +754,11 @@ static inline struct device_node *of_get_cpu_node(int cpu,
         return NULL;
 }
 
+static inline struct device_node *of_get_next_cpu_node(struct device_node *prev)
+{
+        return NULL;
+}
+
 static inline int of_n_addr_cells(struct device_node *np)
 {
         return 0;
@@ -1001,7 +1002,7 @@ static inline struct device_node *of_find_matching_node(
 
 static inline const char *of_node_get_device_type(const struct device_node *np)
 {
-        return of_get_property(np, "type", NULL);
+        return of_get_property(np, "device_type", NULL);
 }
 
 static inline bool of_node_is_type(const struct device_node *np, const char *type)
@@ -1228,6 +1229,10 @@ static inline int of_property_read_s32(const struct device_node *np,
         for (child = of_get_next_available_child(parent, NULL); child != NULL; \
              child = of_get_next_available_child(parent, child))
 
+#define for_each_of_cpu_node(cpu) \
+        for (cpu = of_get_next_cpu_node(NULL); cpu != NULL; \
+             cpu = of_get_next_cpu_node(cpu))
+
 #define for_each_node_with_property(dn, prop_name) \
         for (dn = of_find_node_with_property(NULL, prop_name); dn; \
              dn = of_find_node_with_property(dn, prop_name))
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index ad4fbe5bc730..37a54a6dd594 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1684,6 +1684,7 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
                 fmt = "f";
 
         for (pass = false; strspn(fmt,"fnpPFcC"); fmt++, pass = true) {
+                int precision;
                 if (pass) {
                         if (buf < end)
                                 *buf = ':';
@@ -1695,7 +1696,11 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
                         buf = device_node_gen_full_name(dn, buf, end);
                         break;
                 case 'n':       /* name */
-                        buf = string(buf, end, dn->name, str_spec);
+                        p = kbasename(of_node_full_name(dn));
+                        precision = str_spec.precision;
+                        str_spec.precision = strchrnul(p, '@') - p;
+                        buf = string(buf, end, p, str_spec);
+                        str_spec.precision = precision;
                         break;
                 case 'p':       /* phandle */
                         buf = number(buf, end, (unsigned int)dn->phandle, num_spec);
diff --git a/scripts/Makefile b/scripts/Makefile
index 61affa300d25..ece52ff20171 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -39,8 +39,7 @@ build_unifdef: $(obj)/unifdef
 subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-y                     += mod
 subdir-$(CONFIG_SECURITY_SELINUX) += selinux
-subdir-$(CONFIG_DTC)         += dtc
 subdir-$(CONFIG_GDB_SCRIPTS) += gdb
 
 # Let clean descend into subdirs
-subdir- += basic kconfig package gcc-plugins
+subdir- += basic dtc kconfig package gcc-plugins
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 61e596650ed3..8fe4468f9bda 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -283,7 +283,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE
 
 quiet_cmd_dtc = DTC     $@
 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
-        $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+        $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
         $(DTC) -O dtb -o $@ -b 0 \
                 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
                 -d $(depfile).dtc.tmp $(dtc-tmp) ; \
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
index 1c943e03eaf2..056d5da6c477 100644
--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # scripts/dtc makefile
 
-hostprogs-y     := dtc
+hostprogs-$(CONFIG_DTC) := dtc
 always          := $(hostprogs-y)
 
 dtc-objs        := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \
@@ -11,6 +11,13 @@ dtc-objs	+= dtc-lexer.lex.o dtc-parser.tab.o
 # Source files need to get at the userspace version of libfdt_env.h to compile
 HOST_EXTRACFLAGS := -I$(src)/libfdt
 
+ifeq ($(wildcard /usr/include/yaml.h),)
+HOST_EXTRACFLAGS += -DNO_YAML
+else
+dtc-objs        += yamltree.o
+HOSTLDLIBS_dtc  := -lyaml
+endif
+
 # Generated files need one more search path to include headers in source tree
 HOSTCFLAGS_dtc-lexer.lex.o := -I$(src)
 HOSTCFLAGS_dtc-parser.tab.o := -I$(src)
diff --git a/scripts/dtc/Makefile.dtc b/scripts/dtc/Makefile.dtc
index bece49b35535..d4375630a7f7 100644
--- a/scripts/dtc/Makefile.dtc
+++ b/scripts/dtc/Makefile.dtc
@@ -14,5 +14,9 @@ DTC_SRCS = \
         treesource.c \
         util.c
 
+ifneq ($(NO_YAML),1)
+DTC_SRCS += yamltree.c
+endif
+
 DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c
 DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)
diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index a2cc1036c915..9c9b0c328af6 100644
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -962,6 +962,143 @@ static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct no
 }
 WARNING(simple_bus_reg, check_simple_bus_reg, NULL, &reg_format, &simple_bus_bridge);
 
+static const struct bus_type i2c_bus = {
+        .name = "i2c-bus",
+};
+
+static void check_i2c_bus_bridge(struct check *c, struct dt_info *dti, struct node *node)
+{
+        if (strprefixeq(node->name, node->basenamelen, "i2c-bus") ||
+            strprefixeq(node->name, node->basenamelen, "i2c-arb")) {
+                node->bus = &i2c_bus;
+        } else if (strprefixeq(node->name, node->basenamelen, "i2c")) {
+                struct node *child;
+                for_each_child(node, child) {
+                        if (strprefixeq(child->name, node->basenamelen, "i2c-bus"))
+                                return;
+                }
+                node->bus = &i2c_bus;
+        } else
+                return;
+
+        if (!node->children)
+                return;
+
+        if (node_addr_cells(node) != 1)
+                FAIL(c, dti, node, "incorrect #address-cells for I2C bus");
+        if (node_size_cells(node) != 0)
+                FAIL(c, dti, node, "incorrect #size-cells for I2C bus");
+
+}
+WARNING(i2c_bus_bridge, check_i2c_bus_bridge, NULL, &addr_size_cells);
+
+static void check_i2c_bus_reg(struct check *c, struct dt_info *dti, struct node *node)
+{
+        struct property *prop;
+        const char *unitname = get_unitname(node);
+        char unit_addr[17];
+        uint32_t reg = 0;
+        int len;
+        cell_t *cells = NULL;
+
+        if (!node->parent || (node->parent->bus != &i2c_bus))
+                return;
+
+        prop = get_property(node, "reg");
+        if (prop)
+                cells = (cell_t *)prop->val.val;
+
+        if (!cells) {
+                FAIL(c, dti, node, "missing or empty reg property");
+                return;
+        }
+
+        reg = fdt32_to_cpu(*cells);
+        snprintf(unit_addr, sizeof(unit_addr), "%x", reg);
+        if (!streq(unitname, unit_addr))
+                FAIL(c, dti, node, "I2C bus unit address format error, expected \"%s\"",
+                     unit_addr);
+
+        for (len = prop->val.len; len > 0; len -= 4) {
+                reg = fdt32_to_cpu(*(cells++));
+                if (reg > 0x3ff)
+                        FAIL_PROP(c, dti, node, prop, "I2C address must be less than 10-bits, got \"0x%x\"",
+                                  reg);
+
+        }
+}
+WARNING(i2c_bus_reg, check_i2c_bus_reg, NULL, &reg_format, &i2c_bus_bridge);
+
+static const struct bus_type spi_bus = {
+        .name = "spi-bus",
+};
+
+static void check_spi_bus_bridge(struct check *c, struct dt_info *dti, struct node *node)
+{
+
+        if (strprefixeq(node->name, node->basenamelen, "spi")) {
+                node->bus = &spi_bus;
+        } else {
+                /* Try to detect SPI buses which don't have proper node name */
+                struct node *child;
+
+                if (node_addr_cells(node) != 1 || node_size_cells(node) != 0)
+                        return;
+
+                for_each_child(node, child) {
+                        struct property *prop;
+                        for_each_property(child, prop) {
+                                if (strprefixeq(prop->name, 4, "spi-")) {
+                                        node->bus = &spi_bus;
+                                        break;
+                                }
+                        }
+                        if (node->bus == &spi_bus)
+                                break;
+                }
+
+                if (node->bus == &spi_bus && get_property(node, "reg"))
+                        FAIL(c, dti, node, "node name for SPI buses should be 'spi'");
+        }
+        if (node->bus != &spi_bus || !node->children)
+                return;
+
+        if (node_addr_cells(node) != 1)
+                FAIL(c, dti, node, "incorrect #address-cells for SPI bus");
+        if (node_size_cells(node) != 0)
+                FAIL(c, dti, node, "incorrect #size-cells for SPI bus");
+
+}
+WARNING(spi_bus_bridge, check_spi_bus_bridge, NULL, &addr_size_cells);
+
+static void check_spi_bus_reg(struct check *c, struct dt_info *dti, struct node *node)
+{
+        struct property *prop;
+        const char *unitname = get_unitname(node);
+        char unit_addr[9];
+        uint32_t reg = 0;
+        cell_t *cells = NULL;
+
+        if (!node->parent || (node->parent->bus != &spi_bus))
+                return;
+
+        prop = get_property(node, "reg");
+        if (prop)
+                cells = (cell_t *)prop->val.val;
+
+        if (!cells) {
+                FAIL(c, dti, node, "missing or empty reg property");
+                return;
+        }
+
+        reg = fdt32_to_cpu(*cells);
+        snprintf(unit_addr, sizeof(unit_addr), "%x", reg);
+        if (!streq(unitname, unit_addr))
+                FAIL(c, dti, node, "SPI bus unit address format error, expected \"%s\"",
+                     unit_addr);
+}
+WARNING(spi_bus_reg, check_spi_bus_reg, NULL, &reg_format, &spi_bus_bridge);
+
 static void check_unit_address_format(struct check *c, struct dt_info *dti,
                                       struct node *node)
 {
@@ -1582,6 +1719,12 @@ static struct check *check_table[] = {
         &simple_bus_bridge,
         &simple_bus_reg,
 
+        &i2c_bus_bridge,
+        &i2c_bus_reg,
+
+        &spi_bus_bridge,
+        &spi_bus_reg,
+
         &avoid_default_addr_size,
         &avoid_unnecessary_addr_size,
         &unique_unit_address,
diff --git a/scripts/dtc/data.c b/scripts/dtc/data.c
index aa37a16c8891..4a204145cc7b 100644
--- a/scripts/dtc/data.c
+++ b/scripts/dtc/data.c
@@ -74,7 +74,8 @@ struct data data_copy_escape_string(const char *s, int len)
         struct data d;
         char *q;
 
-        d = data_grow_for(empty_data, len + 1);
+        d = data_add_marker(empty_data, TYPE_STRING, NULL);
+        d = data_grow_for(d, len + 1);
 
         q = d.val;
         while (i < len) {
@@ -94,6 +95,7 @@ struct data data_copy_file(FILE *f, size_t maxlen)
 {
         struct data d = empty_data;
 
+        d = data_add_marker(d, TYPE_NONE, NULL);
         while (!feof(f) && (d.len < maxlen)) {
                 size_t chunksize, ret;
 
diff --git a/scripts/dtc/dtc-parser.y b/scripts/dtc/dtc-parser.y
index 011a5b25539a..dd70ebf386f4 100644
--- a/scripts/dtc/dtc-parser.y
+++ b/scripts/dtc/dtc-parser.y
@@ -287,6 +287,7 @@ propdata:
                 }
         | propdataprefix DT_REF
                 {
+                        $1 = data_add_marker($1, TYPE_STRING, $2);
                         $$ = data_add_marker($1, REF_PATH, $2);
                 }
         | propdataprefix DT_INCBIN '(' DT_STRING ',' integer_prim ',' integer_prim ')'
@@ -340,22 +341,27 @@ arrayprefix:
         DT_BITS DT_LITERAL '<'
                 {
                         unsigned long long bits;
+                        enum markertype type = TYPE_UINT32;
 
                         bits = $2;
 
-                        if ((bits !=  8) && (bits != 16) &&
-                            (bits != 32) && (bits != 64)) {
+                        switch (bits) {
+                        case 8: type = TYPE_UINT8; break;
+                        case 16: type = TYPE_UINT16; break;
+                        case 32: type = TYPE_UINT32; break;
+                        case 64: type = TYPE_UINT64; break;
+                        default:
                                 ERROR(&@2, "Array elements must be"
                                       " 8, 16, 32 or 64-bits");
                                 bits = 32;
                         }
 
-                        $$.data = empty_data;
+                        $$.data = data_add_marker(empty_data, type, NULL);
                         $$.bits = bits;
                 }
         | '<'
                 {
-                        $$.data = empty_data;
+                        $$.data = data_add_marker(empty_data, TYPE_UINT32, NULL);
                         $$.bits = 32;
                 }
         | arrayprefix integer_prim
@@ -499,7 +505,7 @@ integer_unary:
 bytestring:
           /* empty */
                 {
-                        $$ = empty_data;
+                        $$ = data_add_marker(empty_data, TYPE_UINT8, NULL);
                 }
         | bytestring DT_BYTE
                 {
diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index c36994e6eac5..64134aadb997 100644
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -95,6 +95,9 @@ static const char * const usage_opts_help[] = {
         "\n\tOutput formats are:\n"
          "\t\tdts - device tree source text\n"
          "\t\tdtb - device tree blob\n"
+#ifndef NO_YAML
+         "\t\tyaml - device tree encoded as YAML\n"
+#endif
          "\t\tasm - assembler source",
         "\n\tBlob version to produce, defaults to "stringify(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
         "\n\tOutput dependency file",
@@ -128,6 +131,8 @@ static const char *guess_type_by_name(const char *fname, const char *fallback)
                 return fallback;
         if (!strcasecmp(s, ".dts"))
                 return "dts";
+        if (!strcasecmp(s, ".yaml"))
+                return "yaml";
         if (!strcasecmp(s, ".dtb"))
                 return "dtb";
         return fallback;
@@ -350,6 +355,12 @@ int main(int argc, char *argv[])
 
         if (streq(outform, "dts")) {
                 dt_to_source(outf, dti);
+#ifndef NO_YAML
+        } else if (streq(outform, "yaml")) {
+                if (!streq(inform, "dts"))
+                        die("YAML output format requires dts input format\n");
+                dt_to_yaml(outf, dti);
+#endif
         } else if (streq(outform, "dtb")) {
                 dt_to_blob(outf, dti, outversion);
         } else if (streq(outform, "asm")) {
diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h
index 6d667701ab6a..cbe541525c2c 100644
--- a/scripts/dtc/dtc.h
+++ b/scripts/dtc/dtc.h
@@ -74,10 +74,17 @@ typedef uint32_t cell_t;
 
 /* Data blobs */
 enum markertype {
+        TYPE_NONE,
         REF_PHANDLE,
         REF_PATH,
         LABEL,
+        TYPE_UINT8,
+        TYPE_UINT16,
+        TYPE_UINT32,
+        TYPE_UINT64,
+        TYPE_STRING,
 };
+extern const char *markername(enum markertype markertype);
 
 struct  marker {
         enum markertype type;
@@ -101,6 +108,8 @@ struct data {
         for_each_marker(m) \
                 if ((m)->type == (t))
 
+size_t type_marker_length(struct marker *m);
+
 void data_free(struct data d);
 
 struct data data_grow_for(struct data d, int xlen);
@@ -290,6 +299,10 @@ struct dt_info *dt_from_blob(const char *fname);
 void dt_to_source(FILE *f, struct dt_info *dti);
 struct dt_info *dt_from_source(const char *f);
 
+/* YAML source */
+
+void dt_to_yaml(FILE *f, struct dt_info *dti);
+
 /* FS trees */
 
 struct dt_info *dt_from_fs(const char *dirname);
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index 8d268fb785db..851ea87dbc0f 100644
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -393,7 +393,7 @@ void dt_to_blob(FILE *f, struct dt_info *dti, int version)
                         padlen = 0;
                         if (quiet < 1)
                                 fprintf(stderr,
-                                        "Warning: blob size %d >= minimum size %d\n",
+                                        "Warning: blob size %"PRIu32" >= minimum size %d\n",
                                         fdt32_to_cpu(fdt.totalsize), minsize);
                 }
         }
diff --git a/scripts/dtc/libfdt/fdt.c b/scripts/dtc/libfdt/fdt.c
index 7855a1787763..ae03b1112961 100644
--- a/scripts/dtc/libfdt/fdt.c
+++ b/scripts/dtc/libfdt/fdt.c
@@ -55,7 +55,12 @@
 
 #include "libfdt_internal.h"
 
-int fdt_check_header(const void *fdt)
+/*
+ * Minimal sanity check for a read-only tree. fdt_ro_probe_() checks
+ * that the given buffer contains what appears to be a flattened
+ * device tree with sane information in its header.
+ */
+int fdt_ro_probe_(const void *fdt)
 {
         if (fdt_magic(fdt) == FDT_MAGIC) {
                 /* Complete tree */
@@ -74,6 +79,78 @@ int fdt_check_header(const void *fdt)
         return 0;
 }
 
+static int check_off_(uint32_t hdrsize, uint32_t totalsize, uint32_t off)
+{
+        return (off >= hdrsize) && (off <= totalsize);
+}
+
+static int check_block_(uint32_t hdrsize, uint32_t totalsize,
+                        uint32_t base, uint32_t size)
+{
+        if (!check_off_(hdrsize, totalsize, base))
+                return 0; /* block start out of bounds */
+        if ((base + size) < base)
+                return 0; /* overflow */
+        if (!check_off_(hdrsize, totalsize, base + size))
+                return 0; /* block end out of bounds */
+        return 1;
+}
+
+size_t fdt_header_size_(uint32_t version)
+{
+        if (version <= 1)
+                return FDT_V1_SIZE;
+        else if (version <= 2)
+                return FDT_V2_SIZE;
+        else if (version <= 3)
+                return FDT_V3_SIZE;
+        else if (version <= 16)
+                return FDT_V16_SIZE;
+        else
+                return FDT_V17_SIZE;
+}
+
+int fdt_check_header(const void *fdt)
+{
+        size_t hdrsize;
+
+        if (fdt_magic(fdt) != FDT_MAGIC)
+                return -FDT_ERR_BADMAGIC;
+        hdrsize = fdt_header_size(fdt);
+        if ((fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)
+            || (fdt_last_comp_version(fdt) > FDT_LAST_SUPPORTED_VERSION))
+                return -FDT_ERR_BADVERSION;
+        if (fdt_version(fdt) < fdt_last_comp_version(fdt))
+                return -FDT_ERR_BADVERSION;
+
+        if ((fdt_totalsize(fdt) < hdrsize)
+            || (fdt_totalsize(fdt) > INT_MAX))
+                return -FDT_ERR_TRUNCATED;
+
+        /* Bounds check memrsv block */
+        if (!check_off_(hdrsize, fdt_totalsize(fdt), fdt_off_mem_rsvmap(fdt)))
+                return -FDT_ERR_TRUNCATED;
+
+        /* Bounds check structure block */
+        if (fdt_version(fdt) < 17) {
+                if (!check_off_(hdrsize, fdt_totalsize(fdt),
+                                fdt_off_dt_struct(fdt)))
+                        return -FDT_ERR_TRUNCATED;
+        } else {
+                if (!check_block_(hdrsize, fdt_totalsize(fdt),
+                                  fdt_off_dt_struct(fdt),
+                                  fdt_size_dt_struct(fdt)))
+                        return -FDT_ERR_TRUNCATED;
+        }
+
+        /* Bounds check strings block */
+        if (!check_block_(hdrsize, fdt_totalsize(fdt),
+                          fdt_off_dt_strings(fdt), fdt_size_dt_strings(fdt)))
+                return -FDT_ERR_TRUNCATED;
+
+        return 0;
+}
+
 const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
 {
         unsigned absoffset = offset + fdt_off_dt_struct(fdt);
@@ -244,7 +321,7 @@ const char *fdt_find_string_(const char *strtab, int tabsize, const char *s)
 
 int fdt_move(const void *fdt, void *buf, int bufsize)
 {
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         if (fdt_totalsize(fdt) > bufsize)
                 return -FDT_ERR_NOSPACE;
diff --git a/scripts/dtc/libfdt/fdt_addresses.c b/scripts/dtc/libfdt/fdt_addresses.c
index eff4dbcc729d..49537b578d03 100644
--- a/scripts/dtc/libfdt/fdt_addresses.c
+++ b/scripts/dtc/libfdt/fdt_addresses.c
@@ -1,6 +1,7 @@
 /*
  * libfdt - Flat Device Tree manipulation
  * Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au>
+ * Copyright (C) 2018 embedded brains GmbH
  *
  * libfdt is dual licensed: you can use it either under the terms of
  * the GPL, or the BSD license, at your option.
@@ -55,42 +56,32 @@
 
 #include "libfdt_internal.h"
 
-int fdt_address_cells(const void *fdt, int nodeoffset)
+static int fdt_cells(const void *fdt, int nodeoffset, const char *name)
 {
-        const fdt32_t *ac;
+        const fdt32_t *c;
         int val;
         int len;
 
-        ac = fdt_getprop(fdt, nodeoffset, "#address-cells", &len);
-        if (!ac)
+        c = fdt_getprop(fdt, nodeoffset, name, &len);
+        if (!c)
                 return 2;
 
-        if (len != sizeof(*ac))
+        if (len != sizeof(*c))
                 return -FDT_ERR_BADNCELLS;
 
-        val = fdt32_to_cpu(*ac);
+        val = fdt32_to_cpu(*c);
         if ((val <= 0) || (val > FDT_MAX_NCELLS))
                 return -FDT_ERR_BADNCELLS;
 
         return val;
 }
 
-int fdt_size_cells(const void *fdt, int nodeoffset)
+int fdt_address_cells(const void *fdt, int nodeoffset)
 {
-        const fdt32_t *sc;
-        int val;
-        int len;
-
-        sc = fdt_getprop(fdt, nodeoffset, "#size-cells", &len);
-        if (!sc)
-                return 2;
-
-        if (len != sizeof(*sc))
-                return -FDT_ERR_BADNCELLS;
-
-        val = fdt32_to_cpu(*sc);
-        if ((val < 0) || (val > FDT_MAX_NCELLS))
-                return -FDT_ERR_BADNCELLS;
+        return fdt_cells(fdt, nodeoffset, "#address-cells");
+}
 
-        return val;
+int fdt_size_cells(const void *fdt, int nodeoffset)
+{
+        return fdt_cells(fdt, nodeoffset, "#size-cells");
 }
diff --git a/scripts/dtc/libfdt/fdt_overlay.c b/scripts/dtc/libfdt/fdt_overlay.c
index bf75388ec9a2..5fdab6c6371d 100644
--- a/scripts/dtc/libfdt/fdt_overlay.c
+++ b/scripts/dtc/libfdt/fdt_overlay.c
@@ -697,7 +697,7 @@ static int get_path_len(const void *fdt, int nodeoffset)
         int len = 0, namelen;
         const char *name;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         for (;;) {
                 name = fdt_get_name(fdt, nodeoffset, &namelen);
@@ -866,8 +866,8 @@ int fdt_overlay_apply(void *fdt, void *fdto)
         uint32_t delta = fdt_get_max_phandle(fdt);
         int ret;
 
-        FDT_CHECK_HEADER(fdt);
-        FDT_CHECK_HEADER(fdto);
+        FDT_RO_PROBE(fdt);
+        FDT_RO_PROBE(fdto);
 
         ret = overlay_adjust_local_phandles(fdto, delta);
         if (ret)
diff --git a/scripts/dtc/libfdt/fdt_ro.c b/scripts/dtc/libfdt/fdt_ro.c
index dfb3236da388..eafc14282892 100644
--- a/scripts/dtc/libfdt/fdt_ro.c
+++ b/scripts/dtc/libfdt/fdt_ro.c
@@ -76,17 +76,72 @@ static int fdt_nodename_eq_(const void *fdt, int offset,
                 return 0;
 }
 
+const char *fdt_get_string(const void *fdt, int stroffset, int *lenp)
+{
+        uint32_t absoffset = stroffset + fdt_off_dt_strings(fdt);
+        size_t len;
+        int err;
+        const char *s, *n;
+
+        err = fdt_ro_probe_(fdt);
+        if (err != 0)
+                goto fail;
+
+        err = -FDT_ERR_BADOFFSET;
+        if (absoffset >= fdt_totalsize(fdt))
+                goto fail;
+        len = fdt_totalsize(fdt) - absoffset;
+
+        if (fdt_magic(fdt) == FDT_MAGIC) {
+                if (stroffset < 0)
+                        goto fail;
+                if (fdt_version(fdt) >= 17) {
+                        if (stroffset >= fdt_size_dt_strings(fdt))
+                                goto fail;
+                        if ((fdt_size_dt_strings(fdt) - stroffset) < len)
+                                len = fdt_size_dt_strings(fdt) - stroffset;
+                }
+        } else if (fdt_magic(fdt) == FDT_SW_MAGIC) {
+                if ((stroffset >= 0)
+                    || (stroffset < -fdt_size_dt_strings(fdt)))
+                        goto fail;
+                if ((-stroffset) < len)
+                        len = -stroffset;
+        } else {
+                err = -FDT_ERR_INTERNAL;
+                goto fail;
+        }
+
+        s = (const char *)fdt + absoffset;
+        n = memchr(s, '\0', len);
+        if (!n) {
+                /* missing terminating NULL */
+                err = -FDT_ERR_TRUNCATED;
+                goto fail;
+        }
+
+        if (lenp)
+                *lenp = n - s;
+        return s;
+
+fail:
+        if (lenp)
+                *lenp = err;
+        return NULL;
+}
+
 const char *fdt_string(const void *fdt, int stroffset)
 {
-        return (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset;
+        return fdt_get_string(fdt, stroffset, NULL);
 }
 
 static int fdt_string_eq_(const void *fdt, int stroffset,
                           const char *s, int len)
 {
-        const char *p = fdt_string(fdt, stroffset);
+        int slen;
+        const char *p = fdt_get_string(fdt, stroffset, &slen);
 
-        return (strlen(p) == len) && (memcmp(p, s, len) == 0);
+        return p && (slen == len) && (memcmp(p, s, len) == 0);
 }
 
 uint32_t fdt_get_max_phandle(const void *fdt)
@@ -115,21 +170,42 @@ uint32_t fdt_get_max_phandle(const void *fdt)
         return 0;
 }
 
+static const struct fdt_reserve_entry *fdt_mem_rsv(const void *fdt, int n)
+{
+        int offset = n * sizeof(struct fdt_reserve_entry);
+        int absoffset = fdt_off_mem_rsvmap(fdt) + offset;
+
+        if (absoffset < fdt_off_mem_rsvmap(fdt))
+                return NULL;
+        if (absoffset > fdt_totalsize(fdt) - sizeof(struct fdt_reserve_entry))
+                return NULL;
+        return fdt_mem_rsv_(fdt, n);
+}
+
 int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size)
 {
-        FDT_CHECK_HEADER(fdt);
-        *address = fdt64_to_cpu(fdt_mem_rsv_(fdt, n)->address);
-        *size = fdt64_to_cpu(fdt_mem_rsv_(fdt, n)->size);
+        const struct fdt_reserve_entry *re;
+
+        FDT_RO_PROBE(fdt);
+        re = fdt_mem_rsv(fdt, n);
+        if (!re)
+                return -FDT_ERR_BADOFFSET;
+
+        *address = fdt64_ld(&re->address);
+        *size = fdt64_ld(&re->size);
         return 0;
 }
 
 int fdt_num_mem_rsv(const void *fdt)
 {
-        int i = 0;
+        int i;
+        const struct fdt_reserve_entry *re;
 
-        while (fdt64_to_cpu(fdt_mem_rsv_(fdt, i)->size) != 0)
-                i++;
-        return i;
+        for (i = 0; (re = fdt_mem_rsv(fdt, i)) != NULL; i++) {
+                if (fdt64_ld(&re->size) == 0)
+                        return i;
+        }
+        return -FDT_ERR_TRUNCATED;
 }
 
 static int nextprop_(const void *fdt, int offset)
@@ -161,7 +237,7 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset,
 {
         int depth;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         for (depth = 0;
              (offset >= 0) && (depth >= 0);
@@ -187,7 +263,7 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen)
         const char *p = path;
         int offset = 0;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         /* see if we have an alias */
         if (*path != '/') {
@@ -237,7 +313,7 @@ const char *fdt_get_name(const void *fdt, int nodeoffset, int *len)
         const char *nameptr;
         int err;
 
-        if (((err = fdt_check_header(fdt)) != 0)
+        if (((err = fdt_ro_probe_(fdt)) != 0)
             || ((err = fdt_check_node_offset_(fdt, nodeoffset)) < 0))
                         goto fail;
 
@@ -303,7 +379,7 @@ static const struct fdt_property *fdt_get_property_by_offset_(const void *fdt,
         prop = fdt_offset_ptr_(fdt, offset);
 
         if (lenp)
-                *lenp = fdt32_to_cpu(prop->len);
+                *lenp = fdt32_ld(&prop->len);
 
         return prop;
 }
@@ -340,7 +416,7 @@ static const struct fdt_property *fdt_get_property_namelen_(const void *fdt,
                         offset = -FDT_ERR_INTERNAL;
                         break;
                 }
-                if (fdt_string_eq_(fdt, fdt32_to_cpu(prop->nameoff),
+                if (fdt_string_eq_(fdt, fdt32_ld(&prop->nameoff),
                                    name, namelen)) {
                         if (poffset)
                                 *poffset = offset;
@@ -393,7 +469,7 @@ const void *fdt_getprop_namelen(const void *fdt, int nodeoffset,
 
         /* Handle realignment */
         if (fdt_version(fdt) < 0x10 && (poffset + sizeof(*prop)) % 8 &&
-            fdt32_to_cpu(prop->len) >= 8)
+            fdt32_ld(&prop->len) >= 8)
                 return prop->data + 4;
         return prop->data;
 }
@@ -406,12 +482,22 @@ const void *fdt_getprop_by_offset(const void *fdt, int offset,
         prop = fdt_get_property_by_offset_(fdt, offset, lenp);
         if (!prop)
                 return NULL;
-        if (namep)
-                *namep = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
+        if (namep) {
+                const char *name;
+                int namelen;
+                name = fdt_get_string(fdt, fdt32_ld(&prop->nameoff),
+                                      &namelen);
+                if (!name) {
+                        if (lenp)
+                                *lenp = namelen;
+                        return NULL;
+                }
+                *namep = name;
+        }
 
         /* Handle realignment */
         if (fdt_version(fdt) < 0x10 && (offset + sizeof(*prop)) % 8 &&
-            fdt32_to_cpu(prop->len) >= 8)
+            fdt32_ld(&prop->len) >= 8)
                 return prop->data + 4;
         return prop->data;
 }
@@ -436,7 +522,7 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset)
                         return 0;
         }
 
-        return fdt32_to_cpu(*php);
+        return fdt32_ld(php);
 }
 
 const char *fdt_get_alias_namelen(const void *fdt,
@@ -462,7 +548,7 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
         int offset, depth, namelen;
         const char *name;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         if (buflen < 2)
                 return -FDT_ERR_NOSPACE;
@@ -514,7 +600,7 @@ int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset,
         int offset, depth;
         int supernodeoffset = -FDT_ERR_INTERNAL;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         if (supernodedepth < 0)
                 return -FDT_ERR_NOTFOUND;
@@ -573,7 +659,7 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,
         const void *val;
         int len;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         /* FIXME: The algorithm here is pretty horrible: we scan each
          * property of a node in fdt_getprop(), then if that didn't
@@ -599,7 +685,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
         if ((phandle == 0) || (phandle == -1))
                 return -FDT_ERR_BADPHANDLE;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         /* FIXME: The algorithm here is pretty horrible: we
          * potentially scan each property of a node in
@@ -752,7 +838,7 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
 {
         int offset, err;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         /* FIXME: The algorithm here is pretty horrible: we scan each
          * property of a node in fdt_node_check_compatible(), then if
@@ -771,3 +857,66 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
 
         return offset; /* error from fdt_next_node() */
 }
+
+int fdt_check_full(const void *fdt, size_t bufsize)
+{
+        int err;
+        int num_memrsv;
+        int offset, nextoffset = 0;
+        uint32_t tag;
+        unsigned depth = 0;
+        const void *prop;
+        const char *propname;
+
+        if (bufsize < FDT_V1_SIZE)
+                return -FDT_ERR_TRUNCATED;
+        err = fdt_check_header(fdt);
+        if (err != 0)
+                return err;
+        if (bufsize < fdt_totalsize(fdt))
+                return -FDT_ERR_TRUNCATED;
+
+        num_memrsv = fdt_num_mem_rsv(fdt);
+        if (num_memrsv < 0)
+                return num_memrsv;
+
+        while (1) {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+
+                if (nextoffset < 0)
+                        return nextoffset;
+
+                switch (tag) {
+                case FDT_NOP:
+                        break;
+
+                case FDT_END:
+                        if (depth != 0)
+                                return -FDT_ERR_BADSTRUCTURE;
+                        return 0;
+
+                case FDT_BEGIN_NODE:
+                        depth++;
+                        if (depth > INT_MAX)
+                                return -FDT_ERR_BADSTRUCTURE;
+                        break;
+
+                case FDT_END_NODE:
+                        if (depth == 0)
+                                return -FDT_ERR_BADSTRUCTURE;
+                        depth--;
+                        break;
+
+                case FDT_PROP:
+                        prop = fdt_getprop_by_offset(fdt, offset, &propname,
+                                                     &err);
+                        if (!prop)
+                                return err;
+                        break;
+
+                default:
+                        return -FDT_ERR_INTERNAL;
+                }
+        }
+}
diff --git a/scripts/dtc/libfdt/fdt_rw.c b/scripts/dtc/libfdt/fdt_rw.c
index 9b829051e444..2e49855d7cf8 100644
--- a/scripts/dtc/libfdt/fdt_rw.c
+++ b/scripts/dtc/libfdt/fdt_rw.c
@@ -67,9 +67,9 @@ static int fdt_blocks_misordered_(const void *fdt,
                     (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));
 }
 
-static int fdt_rw_check_header_(void *fdt)
+static int fdt_rw_probe_(void *fdt)
 {
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         if (fdt_version(fdt) < 17)
                 return -FDT_ERR_BADVERSION;
@@ -82,10 +82,10 @@ static int fdt_rw_check_header_(void *fdt)
         return 0;
 }
 
-#define FDT_RW_CHECK_HEADER(fdt) \
+#define FDT_RW_PROBE(fdt) \
         { \
                 int err_; \
-                if ((err_ = fdt_rw_check_header_(fdt)) != 0) \
+                if ((err_ = fdt_rw_probe_(fdt)) != 0) \
                         return err_; \
         }
 
@@ -176,7 +176,7 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)
         struct fdt_reserve_entry *re;
         int err;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         re = fdt_mem_rsv_w_(fdt, fdt_num_mem_rsv(fdt));
         err = fdt_splice_mem_rsv_(fdt, re, 0, 1);
@@ -192,7 +192,7 @@ int fdt_del_mem_rsv(void *fdt, int n)
 {
         struct fdt_reserve_entry *re = fdt_mem_rsv_w_(fdt, n);
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         if (n >= fdt_num_mem_rsv(fdt))
                 return -FDT_ERR_NOTFOUND;
@@ -252,7 +252,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name)
         int oldlen, newlen;
         int err;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen);
         if (!namep)
@@ -275,7 +275,7 @@ int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name,
         struct fdt_property *prop;
         int err;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         err = fdt_resize_property_(fdt, nodeoffset, name, len, &prop);
         if (err == -FDT_ERR_NOTFOUND)
@@ -308,7 +308,7 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
         struct fdt_property *prop;
         int err, oldlen, newlen;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);
         if (prop) {
@@ -334,7 +334,7 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name)
         struct fdt_property *prop;
         int len, proplen;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
         if (!prop)
@@ -354,7 +354,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
         uint32_t tag;
         fdt32_t *endtag;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen);
         if (offset >= 0)
@@ -394,7 +394,7 @@ int fdt_del_node(void *fdt, int nodeoffset)
 {
         int endoffset;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         endoffset = fdt_node_end_offset_(fdt, nodeoffset);
         if (endoffset < 0)
@@ -435,7 +435,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
         const char *fdtend = fdtstart + fdt_totalsize(fdt);
         char *tmp;
 
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
 
         mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
                 * sizeof(struct fdt_reserve_entry);
@@ -494,7 +494,7 @@ int fdt_pack(void *fdt)
 {
         int mem_rsv_size;
 
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
 
         mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
                 * sizeof(struct fdt_reserve_entry);
diff --git a/scripts/dtc/libfdt/fdt_sw.c b/scripts/dtc/libfdt/fdt_sw.c
index 6d33cc29d022..9fa4a94d83c3 100644
--- a/scripts/dtc/libfdt/fdt_sw.c
+++ b/scripts/dtc/libfdt/fdt_sw.c
@@ -55,21 +55,77 @@
 
 #include "libfdt_internal.h"
 
-static int fdt_sw_check_header_(void *fdt)
+static int fdt_sw_probe_(void *fdt)
 {
-        if (fdt_magic(fdt) != FDT_SW_MAGIC)
+        if (fdt_magic(fdt) == FDT_MAGIC)
+                return -FDT_ERR_BADSTATE;
+        else if (fdt_magic(fdt) != FDT_SW_MAGIC)
                 return -FDT_ERR_BADMAGIC;
-        /* FIXME: should check more details about the header state */
         return 0;
 }
 
-#define FDT_SW_CHECK_HEADER(fdt) \
+#define FDT_SW_PROBE(fdt) \
+        { \
+                int err; \
+                if ((err = fdt_sw_probe_(fdt)) != 0) \
+                        return err; \
+        }
+
+/* 'memrsv' state:      Initial state after fdt_create()
+ *
+ * Allowed functions:
+ *      fdt_add_reservmap_entry()
+ *      fdt_finish_reservemap()         [moves to 'struct' state]
+ */
+static int fdt_sw_probe_memrsv_(void *fdt)
+{
+        int err = fdt_sw_probe_(fdt);
+        if (err)
+                return err;
+
+        if (fdt_off_dt_strings(fdt) != 0)
+                return -FDT_ERR_BADSTATE;
+        return 0;
+}
+
+#define FDT_SW_PROBE_MEMRSV(fdt) \
+        { \
+                int err; \
+                if ((err = fdt_sw_probe_memrsv_(fdt)) != 0) \
+                        return err; \
+        }
+
+/* 'struct' state:      Enter this state after fdt_finish_reservemap()
+ *
+ * Allowed functions:
+ *      fdt_begin_node()
+ *      fdt_end_node()
+ *      fdt_property*()
+ *      fdt_finish()                    [moves to 'complete' state]
+ */
+static int fdt_sw_probe_struct_(void *fdt)
+{
+        int err = fdt_sw_probe_(fdt);
+        if (err)
+                return err;
+
+        if (fdt_off_dt_strings(fdt) != fdt_totalsize(fdt))
+                return -FDT_ERR_BADSTATE;
+        return 0;
+}
+
+#define FDT_SW_PROBE_STRUCT(fdt) \
         { \
                 int err; \
-                if ((err = fdt_sw_check_header_(fdt)) != 0) \
+                if ((err = fdt_sw_probe_struct_(fdt)) != 0) \
                         return err; \
         }
 
+/* 'complete' state:    Enter this state after fdt_finish()
+ *
+ * Allowed functions: none
+ */
+
 static void *fdt_grab_space_(void *fdt, size_t len)
 {
         int offset = fdt_size_dt_struct(fdt);
@@ -87,9 +143,11 @@ static void *fdt_grab_space_(void *fdt, size_t len)
 
 int fdt_create(void *buf, int bufsize)
 {
+        const size_t hdrsize = FDT_ALIGN(sizeof(struct fdt_header),
+                                         sizeof(struct fdt_reserve_entry));
         void *fdt = buf;
 
-        if (bufsize < sizeof(struct fdt_header))
+        if (bufsize < hdrsize)
                 return -FDT_ERR_NOSPACE;
 
         memset(buf, 0, bufsize);
@@ -99,10 +157,9 @@ int fdt_create(void *buf, int bufsize)
         fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);
         fdt_set_totalsize(fdt,  bufsize);
 
-        fdt_set_off_mem_rsvmap(fdt, FDT_ALIGN(sizeof(struct fdt_header),
-                                              sizeof(struct fdt_reserve_entry)));
+        fdt_set_off_mem_rsvmap(fdt, hdrsize);
         fdt_set_off_dt_struct(fdt, fdt_off_mem_rsvmap(fdt));
-        fdt_set_off_dt_strings(fdt, bufsize);
+        fdt_set_off_dt_strings(fdt, 0);
 
         return 0;
 }
@@ -112,11 +169,14 @@ int fdt_resize(void *fdt, void *buf, int bufsize)
         size_t headsize, tailsize;
         char *oldtail, *newtail;
 
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE(fdt);
 
-        headsize = fdt_off_dt_struct(fdt);
+        headsize = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);
         tailsize = fdt_size_dt_strings(fdt);
 
+        if ((headsize + tailsize) > fdt_totalsize(fdt))
+                return -FDT_ERR_INTERNAL;
+
         if ((headsize + tailsize) > bufsize)
                 return -FDT_ERR_NOSPACE;
 
@@ -133,8 +193,9 @@ int fdt_resize(void *fdt, void *buf, int bufsize)
                 memmove(buf, fdt, headsize);
         }
 
-        fdt_set_off_dt_strings(buf, bufsize);
         fdt_set_totalsize(buf, bufsize);
+        if (fdt_off_dt_strings(buf))
+                fdt_set_off_dt_strings(buf, bufsize);
 
         return 0;
 }
@@ -144,10 +205,7 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
         struct fdt_reserve_entry *re;
         int offset;
 
-        FDT_SW_CHECK_HEADER(fdt);
-
-        if (fdt_size_dt_struct(fdt))
-                return -FDT_ERR_BADSTATE;
+        FDT_SW_PROBE_MEMRSV(fdt);
 
         offset = fdt_off_dt_struct(fdt);
         if ((offset + sizeof(*re)) > fdt_totalsize(fdt))
@@ -164,16 +222,23 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
 
 int fdt_finish_reservemap(void *fdt)
 {
-        return fdt_add_reservemap_entry(fdt, 0, 0);
+        int err = fdt_add_reservemap_entry(fdt, 0, 0);
+
+        if (err)
+                return err;
+
+        fdt_set_off_dt_strings(fdt, fdt_totalsize(fdt));
+        return 0;
 }
 
 int fdt_begin_node(void *fdt, const char *name)
 {
         struct fdt_node_header *nh;
-        int namelen = strlen(name) + 1;
+        int namelen;
 
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
 
+        namelen = strlen(name) + 1;
         nh = fdt_grab_space_(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));
         if (! nh)
                 return -FDT_ERR_NOSPACE;
@@ -187,7 +252,7 @@ int fdt_end_node(void *fdt)
 {
         fdt32_t *en;
 
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
 
         en = fdt_grab_space_(fdt, FDT_TAGSIZE);
         if (! en)
@@ -225,7 +290,7 @@ int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp)
         struct fdt_property *prop;
         int nameoff;
 
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
 
         nameoff = fdt_find_add_string_(fdt, name);
         if (nameoff == 0)
@@ -262,7 +327,7 @@ int fdt_finish(void *fdt)
         uint32_t tag;
         int offset, nextoffset;
 
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
 
         /* Add terminator */
         end = fdt_grab_space_(fdt, sizeof(*end));
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h
index 1e27780e1185..2bd151dd355f 100644
--- a/scripts/dtc/libfdt/libfdt.h
+++ b/scripts/dtc/libfdt/libfdt.h
@@ -90,8 +90,9 @@
 
 /* Error codes: codes for bad device tree blobs */
 #define FDT_ERR_TRUNCATED       8
-        /* FDT_ERR_TRUNCATED: Structure block of the given device tree
-         * ends without an FDT_END tag. */
+        /* FDT_ERR_TRUNCATED: FDT or a sub-block is improperly
+         * terminated (overflows, goes outside allowed bounds, or
+         * isn't properly terminated).  */
 #define FDT_ERR_BADMAGIC        9
         /* FDT_ERR_BADMAGIC: Given "device tree" appears not to be a
          * device tree at all - it is missing the flattened device
@@ -153,6 +154,29 @@ static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
 
 uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);
 
+/*
+ * Alignment helpers:
+ *     These helpers access words from a device tree blob.  They're
+ *     built to work even with unaligned pointers on platforms (ike
+ *     ARM) that don't like unaligned loads and stores
+ */
+
+static inline uint32_t fdt32_ld(const fdt32_t *p)
+{
+        fdt32_t v;
+
+        memcpy(&v, p, sizeof(v));
+        return fdt32_to_cpu(v);
+}
+
+static inline uint64_t fdt64_ld(const fdt64_t *p)
+{
+        fdt64_t v;
+
+        memcpy(&v, p, sizeof(v));
+        return fdt64_to_cpu(v);
+}
+
 /**********************************************************************/
 /* Traversal functions                                                */
 /**********************************************************************/
@@ -213,7 +237,7 @@ int fdt_next_subnode(const void *fdt, int offset);
 /* General functions                                                  */
 /**********************************************************************/
 #define fdt_get_header(fdt, field) \
-        (fdt32_to_cpu(((const struct fdt_header *)(fdt))->field))
+        (fdt32_ld(&((const struct fdt_header *)(fdt))->field))
 #define fdt_magic(fdt)                  (fdt_get_header(fdt, magic))
 #define fdt_totalsize(fdt)              (fdt_get_header(fdt, totalsize))
 #define fdt_off_dt_struct(fdt)          (fdt_get_header(fdt, off_dt_struct))
@@ -244,18 +268,31 @@ fdt_set_hdr_(size_dt_struct);
 #undef fdt_set_hdr_
 
 /**
- * fdt_check_header - sanity check a device tree or possible device tree
+ * fdt_header_size - return the size of the tree's header
+ * @fdt: pointer to a flattened device tree
+ */
+size_t fdt_header_size_(uint32_t version);
+static inline size_t fdt_header_size(const void *fdt)
+{
+        return fdt_header_size_(fdt_version(fdt));
+}
+
+/**
+ * fdt_check_header - sanity check a device tree header
+
  * @fdt: pointer to data which might be a flattened device tree
  *
  * fdt_check_header() checks that the given buffer contains what
- * appears to be a flattened device tree with sane information in its
- * header.
+ * appears to be a flattened device tree, and that the header contains
+ * valid information (to the extent that can be determined from the
+ * header alone).
  *
  * returns:
  *     0, if the buffer appears to contain a valid device tree
  *     -FDT_ERR_BADMAGIC,
  *     -FDT_ERR_BADVERSION,
- *     -FDT_ERR_BADSTATE, standard meanings, as above
+ *     -FDT_ERR_BADSTATE,
+ *     -FDT_ERR_TRUNCATED, standard meanings, as above
  */
 int fdt_check_header(const void *fdt);
 
@@ -284,6 +321,24 @@ int fdt_move(const void *fdt, void *buf, int bufsize);
 /* Read-only functions                                                */
 /**********************************************************************/
 
+int fdt_check_full(const void *fdt, size_t bufsize);
+
+/**
+ * fdt_get_string - retrieve a string from the strings block of a device tree
+ * @fdt: pointer to the device tree blob
+ * @stroffset: offset of the string within the strings block (native endian)
+ * @lenp: optional pointer to return the string's length
+ *
+ * fdt_get_string() retrieves a pointer to a single string from the
+ * strings block of the device tree blob at fdt, and optionally also
+ * returns the string's length in *lenp.
+ *
+ * returns:
+ *     a pointer to the string, on success
+ *     NULL, if stroffset is out of bounds, or doesn't point to a valid string
+ */
+const char *fdt_get_string(const void *fdt, int stroffset, int *lenp);
+
 /**
  * fdt_string - retrieve a string from the strings block of a device tree
  * @fdt: pointer to the device tree blob
@@ -294,7 +349,7 @@ int fdt_move(const void *fdt, void *buf, int bufsize);
  *
  * returns:
  *     a pointer to the string, on success
- *     NULL, if stroffset is out of bounds
+ *     NULL, if stroffset is out of bounds, or doesn't point to a valid string
  */
 const char *fdt_string(const void *fdt, int stroffset);
 
@@ -1090,7 +1145,7 @@ int fdt_address_cells(const void *fdt, int nodeoffset);
  *
  * returns:
  *      0 <= n < FDT_MAX_NCELLS, on success
- *      2, if the node has no #address-cells property
+ *      2, if the node has no #size-cells property
  *      -FDT_ERR_BADNCELLS, if the node has a badly formatted or invalid
  *              #size-cells property
  *      -FDT_ERR_BADMAGIC,
@@ -1313,10 +1368,13 @@ static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val)
         fdt64_t tmp = cpu_to_fdt64(val);
         return fdt_property(fdt, name, &tmp, sizeof(tmp));
 }
+
+#ifndef SWIG /* Not available in Python */
 static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)
 {
         return fdt_property_u32(fdt, name, val);
 }
+#endif
 
 /**
  * fdt_property_placeholder - add a new property and return a ptr to its value
diff --git a/scripts/dtc/libfdt/libfdt_env.h b/scripts/dtc/libfdt/libfdt_env.h
index bd2474628775..eb2053845c9c 100644
--- a/scripts/dtc/libfdt/libfdt_env.h
+++ b/scripts/dtc/libfdt/libfdt_env.h
@@ -56,6 +56,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 
 #ifdef __CHECKER__
 #define FDT_FORCE __attribute__((force))
diff --git a/scripts/dtc/libfdt/libfdt_internal.h b/scripts/dtc/libfdt/libfdt_internal.h
index 7681e192295b..4109f890ae60 100644
--- a/scripts/dtc/libfdt/libfdt_internal.h
+++ b/scripts/dtc/libfdt/libfdt_internal.h
@@ -55,10 +55,11 @@
 #define FDT_ALIGN(x, a)         (((x) + (a) - 1) & ~((a) - 1))
 #define FDT_TAGALIGN(x)         (FDT_ALIGN((x), FDT_TAGSIZE))
 
-#define FDT_CHECK_HEADER(fdt) \
+int fdt_ro_probe_(const void *fdt);
+#define FDT_RO_PROBE(fdt)                       \
         { \
                 int err_; \
-                if ((err_ = fdt_check_header(fdt)) != 0) \
+                if ((err_ = fdt_ro_probe_(fdt)) != 0)   \
                         return err_; \
         }
 
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index 6e4c367f54b3..4ff0679e0062 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -594,6 +594,7 @@ struct node *get_node_by_ref(struct node *tree, const char *ref)
 cell_t get_node_phandle(struct node *root, struct node *node)
 {
         static cell_t phandle = 1; /* FIXME: ick, static local */
+        struct data d = empty_data;
 
         if ((node->phandle != 0) && (node->phandle != -1))
                 return node->phandle;
@@ -603,17 +604,16 @@ cell_t get_node_phandle(struct node *root, struct node *node)
 
         node->phandle = phandle;
 
+        d = data_add_marker(d, TYPE_UINT32, NULL);
+        d = data_append_cell(d, phandle);
+
         if (!get_property(node, "linux,phandle")
             && (phandle_format & PHANDLE_LEGACY))
-                add_property(node,
-                             build_property("linux,phandle",
-                                            data_append_cell(empty_data, phandle)));
+                add_property(node, build_property("linux,phandle", d));
 
         if (!get_property(node, "phandle")
             && (phandle_format & PHANDLE_EPAPR))
-                add_property(node,
-                             build_property("phandle",
-                                            data_append_cell(empty_data, phandle)));
+                add_property(node, build_property("phandle", d));
 
         /* If the node *does* have a phandle property, we must
          * be dealing with a self-referencing phandle, which will be
diff --git a/scripts/dtc/treesource.c b/scripts/dtc/treesource.c
index 2461a3d068a0..f2874f1d1465 100644
--- a/scripts/dtc/treesource.c
+++ b/scripts/dtc/treesource.c
@@ -61,24 +61,14 @@ static bool isstring(char c)
                 || strchr("\a\b\t\n\v\f\r", c));
 }
 
-static void write_propval_string(FILE *f, struct data val)
+static void write_propval_string(FILE *f, const char *s, size_t len)
 {
-        const char *str = val.val;
-        int i;
-        struct marker *m = val.markers;
-
-        assert(str[val.len-1] == '\0');
+        const char *end = s + len - 1;
+        assert(*end == '\0');
 
-        while (m && (m->offset == 0)) {
-                if (m->type == LABEL)
-                        fprintf(f, "%s: ", m->ref);
-                m = m->next;
-        }
         fprintf(f, "\"");
-
-        for (i = 0; i < (val.len-1); i++) {
-                char c = str[i];
-
+        while (s < end) {
+                char c = *s++;
                 switch (c) {
                 case '\a':
                         fprintf(f, "\\a");
@@ -108,91 +98,78 @@ static void write_propval_string(FILE *f, struct data val)
                         fprintf(f, "\\\"");
                         break;
                 case '\0':
-                        fprintf(f, "\", ");
-                        while (m && (m->offset <= (i + 1))) {
-                                if (m->type == LABEL) {
-                                        assert(m->offset == (i+1));
-                                        fprintf(f, "%s: ", m->ref);
-                                }
-                                m = m->next;
-                        }
-                        fprintf(f, "\"");
+                        fprintf(f, "\\0");
                         break;
                 default:
                         if (isprint((unsigned char)c))
                                 fprintf(f, "%c", c);
                         else
-                                fprintf(f, "\\x%02hhx", c);
+                                fprintf(f, "\\x%02"PRIx8, c);
                 }
         }
         fprintf(f, "\"");
-
-        /* Wrap up any labels at the end of the value */
-        for_each_marker_of_type(m, LABEL) {
-                assert (m->offset == val.len);
-                fprintf(f, " %s:", m->ref);
-        }
 }
 
-static void write_propval_cells(FILE *f, struct data val)
+static void write_propval_int(FILE *f, const char *p, size_t len, size_t width)
 {
-        void *propend = val.val + val.len;
-        fdt32_t *cp = (fdt32_t *)val.val;
-        struct marker *m = val.markers;
-
-        fprintf(f, "<");
-        for (;;) {
-                while (m && (m->offset <= ((char *)cp - val.val))) {
-                        if (m->type == LABEL) {
-                                assert(m->offset == ((char *)cp - val.val));
-                                fprintf(f, "%s: ", m->ref);
-                        }
-                        m = m->next;
-                }
+        const char *end = p + len;
+        assert(len % width == 0);
 
-                fprintf(f, "0x%x", fdt32_to_cpu(*cp++));
-                if ((void *)cp >= propend)
+        for (; p < end; p += width) {
+                switch (width) {
+                case 1:
+                        fprintf(f, " %02"PRIx8, *(const uint8_t*)p);
+                        break;
+                case 2:
+                        fprintf(f, " 0x%02"PRIx16, fdt16_to_cpu(*(const fdt16_t*)p));
+                        break;
+                case 4:
+                        fprintf(f, " 0x%02"PRIx32, fdt32_to_cpu(*(const fdt32_t*)p));
+                        break;
+                case 8:
+                        fprintf(f, " 0x%02"PRIx64, fdt64_to_cpu(*(const fdt64_t*)p));
                         break;
-                fprintf(f, " ");
+                }
         }
+}
 
-        /* Wrap up any labels at the end of the value */
-        for_each_marker_of_type(m, LABEL) {
-                assert (m->offset == val.len);
-                fprintf(f, " %s:", m->ref);
-        }
-        fprintf(f, ">");
+static bool has_data_type_information(struct marker *m)
+{
+        return m->type >= TYPE_UINT8;
 }
 
-static void write_propval_bytes(FILE *f, struct data val)
+static struct marker *next_type_marker(struct marker *m)
 {
-        void *propend = val.val + val.len;
-        const char *bp = val.val;
-        struct marker *m = val.markers;
-
-        fprintf(f, "[");
-        for (;;) {
-                while (m && (m->offset == (bp-val.val))) {
-                        if (m->type == LABEL)
-                                fprintf(f, "%s: ", m->ref);
-                        m = m->next;
-                }
+        while (m && !has_data_type_information(m))
+                m = m->next;
+        return m;
+}
 
-                fprintf(f, "%02hhx", (unsigned char)(*bp++));
-                if ((const void *)bp >= propend)
-                        break;
-                fprintf(f, " ");
-        }
+size_t type_marker_length(struct marker *m)
+{
+        struct marker *next = next_type_marker(m->next);
 
-        /* Wrap up any labels at the end of the value */
-        for_each_marker_of_type(m, LABEL) {
-                assert (m->offset == val.len);
-                fprintf(f, " %s:", m->ref);
-        }
-        fprintf(f, "]");
+        if (next)
+                return next->offset - m->offset;
+        return 0;
 }
 
-static void write_propval(FILE *f, struct property *prop)
+static const char *delim_start[] = {
+        [TYPE_UINT8] = "[",
+        [TYPE_UINT16] = "/bits/ 16 <",
+        [TYPE_UINT32] = "<",
+        [TYPE_UINT64] = "/bits/ 64 <",
+        [TYPE_STRING] = "",
+};
+static const char *delim_end[] = {
+        [TYPE_UINT8] = " ]",
+        [TYPE_UINT16] = " >",
+        [TYPE_UINT32] = " >",
+        [TYPE_UINT64] = " >",
+        [TYPE_STRING] = "",
+};
+
+static enum markertype guess_value_type(struct property *prop)
 {
         int len = prop->val.len;
         const char *p = prop->val.val;
@@ -201,11 +178,6 @@ static void write_propval(FILE *f, struct property *prop)
         int nnotstringlbl = 0, nnotcelllbl = 0;
         int i;
 
-        if (len == 0) {
-                fprintf(f, ";\n");
-                return;
-        }
-
         for (i = 0; i < len; i++) {
                 if (! isstring(p[i]))
                         nnotstring++;
@@ -220,17 +192,91 @@ static void write_propval(FILE *f, struct property *prop)
                         nnotcelllbl++;
         }
 
-        fprintf(f, " = ");
         if ((p[len-1] == '\0') && (nnotstring == 0) && (nnul < (len-nnul))
             && (nnotstringlbl == 0)) {
-                write_propval_string(f, prop->val);
+                return TYPE_STRING;
         } else if (((len % sizeof(cell_t)) == 0) && (nnotcelllbl == 0)) {
-                write_propval_cells(f, prop->val);
-        } else {
-                write_propval_bytes(f, prop->val);
+                return TYPE_UINT32;
         }
 
-        fprintf(f, ";\n");
+        return TYPE_UINT8;
+}
+
+static void write_propval(FILE *f, struct property *prop)
+{
+        size_t len = prop->val.len;
+        struct marker *m = prop->val.markers;
+        struct marker dummy_marker;
+        enum markertype emit_type = TYPE_NONE;
+
+        if (len == 0) {
+                fprintf(f, ";\n");
+                return;
+        }
+
+        fprintf(f, " = ");
+
+        if (!next_type_marker(m)) {
+                /* data type information missing, need to guess */
+                dummy_marker.type = guess_value_type(prop);
+                dummy_marker.next = prop->val.markers;
+                dummy_marker.offset = 0;
+                dummy_marker.ref = NULL;
+                m = &dummy_marker;
+        }
+
+        struct marker *m_label = prop->val.markers;
+        for_each_marker(m) {
+                size_t chunk_len;
+                const char *p = &prop->val.val[m->offset];
+
+                if (!has_data_type_information(m))
+                        continue;
+
+                chunk_len = type_marker_length(m);
+                if (!chunk_len)
+                        chunk_len = len - m->offset;
+
+                if (emit_type != TYPE_NONE)
+                        fprintf(f, "%s, ", delim_end[emit_type]);
+                emit_type = m->type;
+
+                for_each_marker_of_type(m_label, LABEL) {
+                        if (m_label->offset > m->offset)
+                                break;
+                        fprintf(f, "%s: ", m_label->ref);
+                }
+
+                fprintf(f, "%s", delim_start[emit_type]);
+
+                if (chunk_len <= 0)
+                        continue;
+
+                switch(emit_type) {
+                case TYPE_UINT16:
+                        write_propval_int(f, p, chunk_len, 2);
+                        break;
+                case TYPE_UINT32:
+                        write_propval_int(f, p, chunk_len, 4);
+                        break;
+                case TYPE_UINT64:
+                        write_propval_int(f, p, chunk_len, 8);
+                        break;
+                case TYPE_STRING:
+                        write_propval_string(f, p, chunk_len);
+                        break;
+                default:
+                        write_propval_int(f, p, chunk_len, 1);
+                }
+        }
+
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m_label, LABEL) {
+                assert (m_label->offset == len);
+                fprintf(f, " %s:", m_label->ref);
+        }
+
+        fprintf(f, "%s;\n", delim_end[emit_type] ? : "");
 }
 
 static void write_tree_source_node(FILE *f, struct node *tree, int level)
@@ -281,4 +327,3 @@ void dt_to_source(FILE *f, struct dt_info *dti)
 
         write_tree_source_node(f, dti->dt, 0);
 }
-
diff --git a/scripts/dtc/update-dtc-source.sh b/scripts/dtc/update-dtc-source.sh
index 1a009fd195d0..7dd29a0362b8 100755
--- a/scripts/dtc/update-dtc-source.sh
+++ b/scripts/dtc/update-dtc-source.sh
@@ -32,7 +32,7 @@ DTC_UPSTREAM_PATH=`pwd`/../dtc
 DTC_LINUX_PATH=`pwd`/scripts/dtc
 
 DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \
-                srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \
+                srcpos.h treesource.c util.c util.h version_gen.h yamltree.c Makefile.dtc \
                 dtc-lexer.l dtc-parser.y"
 LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \
                 fdt_overlay.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c \
diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
index 9953c32a0244..a69b7a13463d 100644
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -227,11 +227,11 @@ char get_escape_char(const char *s, int *i)
         return val;
 }
 
-int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)
+int utilfdt_read_err(const char *filename, char **buffp, size_t *len)
 {
         int fd = 0;     /* assume stdin */
         char *buf = NULL;
-        off_t bufsize = 1024, offset = 0;
+        size_t bufsize = 1024, offset = 0;
         int ret = 0;
 
         *buffp = NULL;
@@ -264,20 +264,15 @@ int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)
                 free(buf);
         else
                 *buffp = buf;
-        *len = bufsize;
+        if (len)
+                *len = bufsize;
         return ret;
 }
 
-int utilfdt_read_err(const char *filename, char **buffp)
-{
-        off_t len;
-        return utilfdt_read_err_len(filename, buffp, &len);
-}
-
-char *utilfdt_read_len(const char *filename, off_t *len)
+char *utilfdt_read(const char *filename, size_t *len)
 {
         char *buff;
-        int ret = utilfdt_read_err_len(filename, &buff, len);
+        int ret = utilfdt_read_err(filename, &buff, len);
 
         if (ret) {
                 fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,
@@ -288,12 +283,6 @@ char *utilfdt_read_len(const char *filename, off_t *len)
         return buff;
 }
 
-char *utilfdt_read(const char *filename)
-{
-        off_t len;
-        return utilfdt_read_len(filename, &len);
-}
-
 int utilfdt_write_err(const char *filename, const void *blob)
 {
         int fd = 1;     /* assume stdout */
diff --git a/scripts/dtc/util.h b/scripts/dtc/util.h
index 66fba8ea709b..f6cea8274174 100644
--- a/scripts/dtc/util.h
+++ b/scripts/dtc/util.h
@@ -98,16 +98,10 @@ char get_escape_char(const char *s, int *i);
  * stderr.
  *
  * @param filename      The filename to read, or - for stdin
- * @return Pointer to allocated buffer containing fdt, or NULL on error
- */
-char *utilfdt_read(const char *filename);
-
-/**
- * Like utilfdt_read(), but also passes back the size of the file read.
- *
  * @param len           If non-NULL, the amount of data we managed to read
+ * @return Pointer to allocated buffer containing fdt, or NULL on error
  */
-char *utilfdt_read_len(const char *filename, off_t *len);
+char *utilfdt_read(const char *filename, size_t *len);
 
 /**
  * Read a device tree file into a buffer. Does not report errors, but only
@@ -116,16 +110,10 @@ char *utilfdt_read_len(const char *filename, off_t *len);
  *
  * @param filename      The filename to read, or - for stdin
  * @param buffp         Returns pointer to buffer containing fdt
- * @return 0 if ok, else an errno value representing the error
- */
-int utilfdt_read_err(const char *filename, char **buffp);
-
-/**
- * Like utilfdt_read_err(), but also passes back the size of the file read.
- *
  * @param len           If non-NULL, the amount of data we managed to read
+ * @return 0 if ok, else an errno value representing the error
  */
-int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len);
+int utilfdt_read_err(const char *filename, char **buffp, size_t *len);
 
 /**
  * Write a device tree buffer to a file. This will report any errors on
diff --git a/scripts/dtc/version_gen.h b/scripts/dtc/version_gen.h
index b00f14ff7a17..6d23fd095f16 100644
--- a/scripts/dtc/version_gen.h
+++ b/scripts/dtc/version_gen.h
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.6-g84e414b0"
+#define DTC_VERSION "DTC 1.4.7-gc86da84d"
diff --git a/scripts/dtc/yamltree.c b/scripts/dtc/yamltree.c
new file mode 100644
index 000000000000..a00285a5a9ec
--- /dev/null
+++ b/scripts/dtc/yamltree.c
@@ -0,0 +1,247 @@
+/*
+ * (C) Copyright Linaro, Ltd. 2018
+ * (C) Copyright Arm Holdings.  2017
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ * 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.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include <stdlib.h>
+#include <yaml.h>
+#include "dtc.h"
+#include "srcpos.h"
+
+char *yaml_error_name[] = {
+        [YAML_NO_ERROR] = "no error",
+        [YAML_MEMORY_ERROR] = "memory error",
+        [YAML_READER_ERROR] = "reader error",
+        [YAML_SCANNER_ERROR] = "scanner error",
+        [YAML_PARSER_ERROR] = "parser error",
+        [YAML_COMPOSER_ERROR] = "composer error",
+        [YAML_WRITER_ERROR] = "writer error",
+        [YAML_EMITTER_ERROR] = "emitter error",
+};
+
+#define yaml_emitter_emit_or_die(emitter, event) (                      \
+{                                                                       \
+        if (!yaml_emitter_emit(emitter, event))                         \
+                die("yaml '%s': %s in %s, line %i\n",                   \
+                    yaml_error_name[(emitter)->error],                  \
+                    (emitter)->problem, __func__, __LINE__);            \
+})
+
+static void yaml_propval_int(yaml_emitter_t *emitter, struct marker *markers, char *data, int len, int width)
+{
+        yaml_event_t event;
+        void *tag;
+        int off, start_offset = markers->offset;
+
+        switch(width) {
+                case 1: tag = "!u8"; break;
+                case 2: tag = "!u16"; break;
+                case 4: tag = "!u32"; break;
+                case 8: tag = "!u64"; break;
+                default:
+                        die("Invalid width %i", width);
+        }
+        assert(len % width == 0);
+
+        yaml_sequence_start_event_initialize(&event, NULL,
+                (yaml_char_t *)tag, width == 4, YAML_FLOW_SEQUENCE_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+
+        for (off = 0; off < len; off += width) {
+                char buf[32];
+                struct marker *m;
+                bool is_phandle = false;
+
+                switch(width) {
+                case 1:
+                        sprintf(buf, "0x%"PRIx8, *(uint8_t*)(data + off));
+                        break;
+                case 2:
+                        sprintf(buf, "0x%"PRIx16, fdt16_to_cpu(*(fdt16_t*)(data + off)));
+                        break;
+                case 4:
+                        sprintf(buf, "0x%"PRIx32, fdt32_to_cpu(*(fdt32_t*)(data + off)));
+                        m = markers;
+                        is_phandle = false;
+                        for_each_marker_of_type(m, REF_PHANDLE) {
+                                if (m->offset == (start_offset + off)) {
+                                        is_phandle = true;
+                                        break;
+                                }
+                        }
+                        break;
+                case 8:
+                        sprintf(buf, "0x%"PRIx64, fdt64_to_cpu(*(fdt64_t*)(data + off)));
+                        break;
+                }
+
+                if (is_phandle)
+                        yaml_scalar_event_initialize(&event, NULL,
+                                (yaml_char_t*)"!phandle", (yaml_char_t *)buf,
+                                strlen(buf), 0, 0, YAML_PLAIN_SCALAR_STYLE);
+                else
+                        yaml_scalar_event_initialize(&event, NULL,
+                                (yaml_char_t*)YAML_INT_TAG, (yaml_char_t *)buf,
+                                strlen(buf), 1, 1, YAML_PLAIN_SCALAR_STYLE);
+                yaml_emitter_emit_or_die(emitter, &event);
+        }
+
+        yaml_sequence_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+
+static void yaml_propval_string(yaml_emitter_t *emitter, char *str, int len)
+{
+        yaml_event_t event;
+        int i;
+
+        assert(str[len-1] == '\0');
+
+        /* Make sure the entire string is in the lower 7-bit ascii range */
+        for (i = 0; i < len; i++)
+                assert(isascii(str[i]));
+
+        yaml_scalar_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_STR_TAG, (yaml_char_t*)str,
+                len-1, 0, 1, YAML_DOUBLE_QUOTED_SCALAR_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+
+static void yaml_propval(yaml_emitter_t *emitter, struct property *prop)
+{
+        yaml_event_t event;
+        int len = prop->val.len;
+        struct marker *m = prop->val.markers;
+
+        /* Emit the property name */
+        yaml_scalar_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_STR_TAG, (yaml_char_t*)prop->name,
+                strlen(prop->name), 1, 1, YAML_PLAIN_SCALAR_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+
+        /* Boolean properties are easiest to deal with. Length is zero, so just emit 'true' */
+        if (len == 0) {
+                yaml_scalar_event_initialize(&event, NULL,
+                        (yaml_char_t *)YAML_BOOL_TAG,
+                        (yaml_char_t*)"true",
+                        strlen("true"), 1, 0, YAML_PLAIN_SCALAR_STYLE);
+                yaml_emitter_emit_or_die(emitter, &event);
+                return;
+        }
+
+        if (!m)
+                die("No markers present in property '%s' value\n", prop->name);
+
+        yaml_sequence_start_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_SEQ_TAG, 1, YAML_FLOW_SEQUENCE_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+
+        for_each_marker(m) {
+                int chunk_len;
+                char *data = &prop->val.val[m->offset];
+
+                if (m->type < TYPE_UINT8)
+                        continue;
+
+                chunk_len = type_marker_length(m) ? : len;
+                assert(chunk_len > 0);
+                len -= chunk_len;
+
+                switch(m->type) {
+                case TYPE_UINT16:
+                        yaml_propval_int(emitter, m, data, chunk_len, 2);
+                        break;
+                case TYPE_UINT32:
+                        yaml_propval_int(emitter, m, data, chunk_len, 4);
+                        break;
+                case TYPE_UINT64:
+                        yaml_propval_int(emitter, m, data, chunk_len, 8);
+                        break;
+                case TYPE_STRING:
+                        yaml_propval_string(emitter, data, chunk_len);
+                        break;
+                default:
+                        yaml_propval_int(emitter, m, data, chunk_len, 1);
+                        break;
+                }
+        }
+
+        yaml_sequence_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+
+
+static void yaml_tree(struct node *tree, yaml_emitter_t *emitter)
+{
+        struct property *prop;
+        struct node *child;
+        yaml_event_t event;
+
+        if (tree->deleted)
+                return;
+
+        yaml_mapping_start_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_MAP_TAG, 1, YAML_ANY_MAPPING_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+
+        for_each_property(tree, prop)
+                yaml_propval(emitter, prop);
+
+        /* Loop over all the children, emitting them into the map */
+        for_each_child(tree, child) {
+                yaml_scalar_event_initialize(&event, NULL,
+                        (yaml_char_t *)YAML_STR_TAG, (yaml_char_t*)child->name,
+                        strlen(child->name), 1, 0, YAML_PLAIN_SCALAR_STYLE);
+                yaml_emitter_emit_or_die(emitter, &event);
+                yaml_tree(child, emitter);
+        }
+
+        yaml_mapping_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+
+void dt_to_yaml(FILE *f, struct dt_info *dti)
+{
+        yaml_emitter_t emitter;
+        yaml_event_t event;
+
+        yaml_emitter_initialize(&emitter);
+        yaml_emitter_set_output_file(&emitter, f);
+        yaml_stream_start_event_initialize(&event, YAML_UTF8_ENCODING);
+        yaml_emitter_emit_or_die(&emitter, &event);
+
+        yaml_document_start_event_initialize(&event, NULL, NULL, NULL, 0);
+        yaml_emitter_emit_or_die(&emitter, &event);
+
+        yaml_sequence_start_event_initialize(&event, NULL, (yaml_char_t *)YAML_SEQ_TAG, 1, YAML_ANY_SEQUENCE_STYLE);
+        yaml_emitter_emit_or_die(&emitter, &event);
+
+        yaml_tree(dti->dt, &emitter);
+
+        yaml_sequence_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(&emitter, &event);
+
+        yaml_document_end_event_initialize(&event, 0);
+        yaml_emitter_emit_or_die(&emitter, &event);
+
+        yaml_stream_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(&emitter, &event);
+
+        yaml_emitter_delete(&emitter);
+}