summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-07-31 19:13:27 -0700
committerOlof Johansson <olof@lixom.net>2018-07-31 19:13:27 -0700
commit4f53a4a76cdff0c33f40a31785712da5911769fc (patch)
treedb2933cd2a997c6cab3cdb12ba4713e1806abe54 /Documentation
parent2dd207c91ab74b1b26b6926905a6be57508a872a (diff)
parent0fbfe10fa96b8df44cfb140a6672f9418e16a2a6 (diff)
downloadlinux-stable-4f53a4a76cdff0c33f40a31785712da5911769fc.tar.gz
linux-stable-4f53a4a76cdff0c33f40a31785712da5911769fc.tar.bz2
linux-stable-4f53a4a76cdff0c33f40a31785712da5911769fc.zip
Merge tag 'v4.19-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
A new board, the Vamrs Ficus using the rk3399 and followin the 96boards standard. LEDs and power button for the rk3399 firefly and removal of some deprecated type-c properties from the rk3399 devicetree. * tag 'v4.19-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: add led support for Firefly-RK3399 arm64: dts: rockchip: remove deprecated Type-C PHY properties on rk3399 arm64: dts: rockchip: add power button support for Firefly-RK3399 arm64: dts: rockchip: drop out-of-tree properties from rk3399-ficus regulator arm64: dts: rockchip: add voltage properties for vcc3v3_pcie on rk3399 ficus arm64: dts: rockchip: add USB 2.0 and 3.0 support on Ficus board arm64: dts: rockchip: add 96boards RK3399 Ficus board dt-bindings: Add vendor prefix for Vamrs Ltd. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/rockchip.txt5
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.txt1
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index 145ab0b0a030..acfd3c773dd0 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -1,5 +1,10 @@
Rockchip platforms device tree bindings
---------------------------------------
+
+- 96boards RK3399 Ficus (ROCK960 Enterprise Edition)
+ Required root node properties:
+ - compatible = "vamrs,ficus", "rockchip,rk3399";
+
- Amarula Vyasa RK3288 board
Required root node properties:
- compatible = "amarula,vyasa-rk3288", "rockchip,rk3288";
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 6770f8d75bb0..4468a65a446b 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -396,6 +396,7 @@ upisemi uPI Semiconductor Corp.
urt United Radiant Technology Corporation
usi Universal Scientific Industrial Co., Ltd.
v3 V3 Semiconductor
+vamrs Vamrs Ltd.
variscite Variscite Ltd.
via VIA Technologies, Inc.
virtio Virtual I/O Device Specification, developed by the OASIS consortium