Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM DT updates from Olof Johansson:
 "As usual, the bulk of this release is again DT file contents.

  There's a huge number of changes here, and it's challenging to give a
  crisp overview of just what is in here.  To start with:

  New boards:

   - TI-based DM3730 from LogicPD (Torpedo)
   - Cosmic+ M4 (nommu) initial support (Freescale Vybrid)
   - Raspberry Pi 2 DT files
   - Watchdog on Meson8b
   - Veyron-mickey (ASUS Chromebit) DTS
   - Rockchip rk3228 SoC and eval board
   - Sigma Designs Tango4

  Improvements:

   - Improved support for Qualcomm APQ8084, including Sony Xperia Z DT files
   - Misc new devices for Rockchip rk3036 and rk3288
   - Allwinner updates for misc SoCs and systems

  ... and a _large_ number of other changes across the field.  Devices
  added to SoC DTSI and board DTS files for a number of SoC vendors, new
  product boards on already-supported SoCs, cleanups and refactorings of
  existing DTS/DTSI files and a bunch of other changes"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (469 commits)
  ARM: dts: compulab: add new board description
  ARM: versatile: add the syscon LEDs to the DT
  dts: vt8500: Fix errors in SDHC node for WM8505
  ARM: dts: imx6q: clean up unused ipu2grp
  ARM: dts: silk: Add compatible property to "partitions" node
  ARM: dts: gose: Add compatible property to "partitions" node
  ARM: dts: porter: Add compatible property to "partitions" node
  ARM: dts: koelsch: Add compatible property to "partitions" node
  ARM: dts: lager: Add compatible property to "partitions" node
  ARM: dts: bockw: Add compatible property to "partitions" node
  ARM: dts: meson8b: Add watchdog node
  Documentation: watchdog: Add new bindings for meson8b
  ARM: meson: Add status LED for Odroid-C1
  ARM: dts: uniphier: fix a typo in comment block
  ARM: bcm2835: Add the auxiliary clocks to the device tree.
  ARM: bcm2835: Add devicetree for bcm2836 and Raspberry Pi 2 B
  ARM: bcm2835: Move the CPU/peripheral include out of common RPi DT.
  ARM: bcm2835: Split the DT for peripherals from the DT for the CPU
  ARM: realview: set up cache correctly on the PB11MPCore
  ARM: dts: Unify G2D device node with other devices on exynos4
  ...

diff --cc Documentation/devicetree/bindings/arm/cpus.txt
index 9bddd9fc7b5a47d014aaccabbc6f5f3578a2c5b5,d1915549e0094c024a56ad5a7e18dbe82f16a140..ae9be074d09f66d503adccc539c892e6cf13af90
--- 1/Documentation/devicetree/bindings/arm/cpus.txt
--- 2/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@@ -191,7 -190,7 +191,8 @@@ nodes to be present and contain the pro
                            "allwinner,sun6i-a31"
                            "allwinner,sun8i-a23"
                            "arm,psci"
 +                          "arm,realview-smp"
+                           "brcm,bcm-nsp-smp"
                            "brcm,brahma-b15"
                            "marvell,armada-375-smp"
                            "marvell,armada-380-smp"

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 084439d357475669c216394097e86faa5c7efd7d,e4cd78a4c652fff7e580863eb039af675400018c..72e2c5a2b3278facb20378383cbb63baa6485e0f
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -124,7 -123,7 +124,8 @@@ jedec      JEDEC Solid State Technology Asso
  karo  Ka-Ro electronics GmbH
  keymile       Keymile GmbH
  kinetic Kinetic Technologies
+ kosagi        Sutajio Ko-Usagi PTE Ltd.
 +kyo   Kyocera Corporation
  lacie LaCie
  lantiq        Lantiq Semiconductor
  lenovo        Lenovo Group Ltd.

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/at91-sama5d2_xplained.dts
Simple merge

diff --cc arch/arm/boot/dts/berlin2q.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dm816x.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5800-peach-pi.dts
Simple merge

diff --cc arch/arm/boot/dts/omap4-duovero-parlor.dts
Simple merge

diff --cc arch/arm/boot/dts/r8a7740.dtsi
Simple merge

diff --cc arch/arm/boot/dts/r8a7778.dtsi
Simple merge

diff --cc arch/arm/boot/dts/versatile-ab.dts
Simple merge

diff --cc arch/arm/mach-omap2/pdata-quirks.c
Simple merge

diff --cc arch/arm64/boot/dts/mediatek/mt8173.dtsi
index c1fd2757f8e44ae67ce88bc90423d69916093c66,fd71a87588f1dc2c7a2244d3dddccf4995232e7c..424a4939c1b4b511b9a55b9e101c0a1a846679c7
--- 1/arch/arm64/boot/dts/mediatek/mt8173.dtsi
--- 2/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@@ -14,9 -14,8 +14,9 @@@
  #include <dt-bindings/clock/mt8173-clk.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/interrupt-controller/arm-gic.h>
 +#include <dt-bindings/phy/phy.h>
  #include <dt-bindings/power/mt8173-power.h>
- #include <dt-bindings/reset-controller/mt8173-resets.h>
+ #include <dt-bindings/reset/mt8173-resets.h>
  #include "mt8173-pinfunc.h"
  
  / {