From: Olof Johansson Date: Wed, 19 Apr 2017 13:45:10 +0000 (-0700) Subject: Merge tag 'v4.12-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~11338^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b633b314061ea26cefa2600bf4d353a462f0c7aa;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'v4.12-rockchip-dts32-2' of git://git./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 --- b633b314061ea26cefa2600bf4d353a462f0c7aa