Merge tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "ARM: rockchip: second batch of dts updates for 3.20" from Heiko Stübner:

Basic display nodes for crtcs and hdmi encoder, timer node
for the broadcast timer going through the clocksource tree
and two new boards, the rk3288-based Firefly and the
PX2-based Rayeager board (the PX2 is identical to the rk3066
but made for industrial users).

* tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add dts for ChipSPARK Rayeager PX2 board
  ARM: dts: rockchip: add dts for Firefly Firefly-RK3288 boards
  dt-bindings: add vendor prefix and root compatible property for Rockchip boards
  ARM: dts: rockchip: Add rockchip timer node for rk3288
  ARM: dts: rockchip: add rk3288 hdmi nodes
  ARM: dts: rockchip: Add rk3288 vop and display-subsystem

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc arch/arm/boot/dts/Makefile
index 99896543aa38c311820182193004da4594a36cbe,7442f3d6ae3f6dd8851964ef13197d3cae59c542..09f28f468b83331efaf2e78847743b1a09be1b8a
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -444,16 -392,16 +444,19 @@@ dtb-$(CONFIG_ARCH_REALVIEW) += 
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3066a-bqcurie2.dtb \
        rk3066a-marsboard.dtb \
+       rk3066a-rayeager.dtb \
        rk3188-radxarock.dtb \
        rk3288-evb-act8846.dtb \
-       rk3288-evb-rk808.dtb
+       rk3288-evb-rk808.dtb \
+       rk3288-firefly-beta.dtb \
+       rk3288-firefly.dtb
 -dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 -dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
 +dtb-$(CONFIG_ARCH_S3C24XX) += \
 +      s3c2416-smdk2416.dtb
 +dtb-$(CONFIG_ARCH_S3C64XX) += \
 +      s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
 -dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-aquila.dtb \
 +dtb-$(CONFIG_ARCH_S5PV210) += \
 +      s5pv210-aquila.dtb \
        s5pv210-goni.dtb \
        s5pv210-smdkc110.dtb \
        s5pv210-smdkv210.dtb \