tree 529dce3c569d94843f817be0e4615770037ebf28
parent 6daf2aab1ca801a2e8a42537aadad26fd321e90d
parent 81507732449076de35db3b5a439e4dfd548c6b5a
author Olof Johansson <olof@lixom.net> 1492609510 -0700
committer Olof Johansson <olof@lixom.net> 1492609510 -0700
mergetag object 81507732449076de35db3b5a439e4dfd548c6b5a
 type commit
 tag v4.12-rockchip-dts32-2
 tagger Heiko Stuebner <heiko@sntech.de> 1491681909 +0200
 
 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAljpQsEQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgSw5CACTf+7cvykZ3aKvtfo76yacC84mSMdLFOQl
 IPkQBX6cV2CEes8xoKjsHXwvYgpgX6Jz58S86ATfi+h3uMu4l7dld+yMaipTcZp/
 ROCtf16r+sjq3kndDGoqSFyq5+YZ2En+mz+86YDdEYS3vZvASp+gSVRkn7NUPlrU
 +O2Wb8mdY+Hl8XYSZcsmQ7zNjxw/G9pyqVly0/3aSuHRVAbtn4KyunbfkhHdK4LJ
 NOFji0t+FIXEr8FNBpiRFnIQ19KILzWmrIr5c92Tz+t11R8+wSIwITYpsAomwVqO
 QWtI1alwusJHY2MwdLXlFtBAW3BwsTt72gasl6AigpvYIP0AxKna
 =R6eU
 -----END PGP SIGNATURE-----

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

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>