From: Olof Johansson <olof@lixom.net>
Date: Wed, 28 Jan 2015 00:24:08 +0000 (-0800)
Subject: Merge tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0ac4f3e067dc9b233de9300214a98cc4ccb46d3;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'v3.20-rockchip-dts2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt

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>
---

f0ac4f3e067dc9b233de9300214a98cc4ccb46d3
diff --cc arch/arm/boot/dts/Makefile
index 99896543aa38,7442f3d6ae3f..09f28f468b83
--- a/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 \