Merge tag 'v4.12-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

Support for the usb-sata controller on the rock2 and another new rk3288
board, the phyCORE som and its PCM-947 carrier board from Phytec.

* tag 'v4.12-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Add support for PCM-947 carrier board
  dt-bindings: Document Phytec phyCORE-RK3288 RDK
  ARM: dts: rockchip: Add support for phyCORE-RK3288 SoM
  ARM: dts: rockchip: Enable sata support on rock2 square

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

diff --cc arch/arm/boot/dts/Makefile
Simple merge