diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 06:45:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 06:45:10 -0700 |
| commit | b633b314061ea26cefa2600bf4d353a462f0c7aa (patch) | |
| tree | 529dce3c569d94843f817be0e4615770037ebf28 /Documentation | |
| parent | 6daf2aab1ca801a2e8a42537aadad26fd321e90d (diff) | |
| parent | 81507732449076de35db3b5a439e4dfd548c6b5a (diff) | |
| download | linux-b633b314061ea26cefa2600bf4d353a462f0c7aa.tar.gz linux-b633b314061ea26cefa2600bf4d353a462f0c7aa.tar.bz2 linux-b633b314061ea26cefa2600bf4d353a462f0c7aa.zip | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/rockchip.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt index 226ee9131078..6b8d50a0ee78 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.txt +++ b/Documentation/devicetree/bindings/arm/rockchip.txt @@ -106,6 +106,10 @@ Rockchip platforms device tree bindings Required root node properties: - compatible = "mqmaker,miqi", "rockchip,rk3288"; +- Phytec phyCORE-RK3288: Rapid Development Kit + Required root node properties: + - compatible = "phytec,rk3288-pcm-947", "phytec,rk3288-phycore-som", "rockchip,rk3288"; + - Rockchip PX3 Evaluation board: Required root node properties: - compatible = "rockchip,px3-evb", "rockchip,px3", "rockchip,rk3188"; |