summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-12 00:58:08 +0100
committerArnd Bergmann <arnd@arndb.de>2015-12-12 00:58:08 +0100
commitfc3359b97f29538c9ffcf7bc71fbd13b7f7f2d04 (patch)
treecd3a1528f9d646e76ae073c21ae667a9363980d7 /Documentation/devicetree/bindings/arm
parent4702d5993aa2d5e59659cc0fa9fe02c00cd8f719 (diff)
parent5378e28c9776fbab6065cfb54417acff3ea5f1fd (diff)
Merge tag 'v4.5-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64
Merge "rockchip dts64 changes for 4.5" from Heiko Stuebner: First round of 64bit devicetree changes for Rockchip socs. This includes support for the evaluation board of the rk3368 as well as the dts-part for the newly added thermal management support, rk3368 pwm nodes and an alias. * tag 'v4.5-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: add rk3368 evaluation board arm64: dts: rockchip: add the pwm node info for RK3368 SoCs arm64: dts: rockchip: Enable the Thermal on R88 board arm64: dts: rockchip: Add main thermal info to rk3368.dtsi arm64: dts: rockchip: Add the thermal data found on RK3368 arm64: dts: rockchip: Setup rk3368 ethernet0 alias for u-boot
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r--Documentation/devicetree/bindings/arm/rockchip.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index 8e985dd2f181..c40c091f6923 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -69,6 +69,10 @@ Rockchip platforms device tree bindings
"google,veyron-speedy-rev3", "google,veyron-speedy-rev2",
"google,veyron-speedy", "google,veyron", "rockchip,rk3288";
+- Rockchip RK3368 evb:
+ Required root node properties:
+ - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";
+
- Rockchip R88 board:
Required root node properties:
- compatible = "rockchip,r88", "rockchip,rk3368";