Merge tag 'v3.19-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:42:17 +0000 (17:42 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 16:42:17 +0000 (17:42 +0100)
commit2dfb8bf3be899a685b7ec8713145e578d3c20f5b
treed15920e73f26fce6f7feda284b12f9f252308d24
parentaf947cbf5c72c0071fc13ffc76d1e67a8b9e0fb6
parentefb66e93d13da5a7b11b3a8dbb24a6fb29141752
Merge tag 'v3.19-rockchip-dts2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "ARM: rockchip: second batch of dts related changes" from Heiko Stuebner:

- the dts part of the rk3288 smp support
- rate init for rk3288 clocks
- enablement of various peripherals
- new boardfile for Haoyu Marsboard (rk3066 based)

* tag 'v3.19-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: enable PWM on Radxa Rock
  ARM: dts: rockchip: fix invalid unit-address in rk3188.dtsi
  ARM: dts: rk3288: add VOP iommu nodes
  ARM: dts: rockchip: add reset for CPU nodes
  ARM: dts: rockchip: add intmem node for rk3288 smp support
  ARM: dts: rockchip: add pmu references to cpus nodes
  ARM: dts: rockchip: add serial aliases for rk3066 and rk3188
  ARM: dts: rockchip: Add devicetree source for MarsBoard RK3066
  ARM: dts: rockchip: Add EMAC Rockchip for RK3066 SoCs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/Makefile