diff options
| author | Olof Johansson <olof@lixom.net> | 2016-04-13 15:30:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-04-13 15:30:20 -0700 |
| commit | e24f89e37bee8a11050ce87293814e2c86e3b330 (patch) | |
| tree | 343b98254c674c3a82ce791ba6729d55acf275bb /Documentation/devicetree/bindings/arm | |
| parent | 56a0eccdc0dec223d4625c80de31514f04390159 (diff) | |
| parent | 40ac568d0ef07b60ba8cc0f2e88ccdd4dd0e176a (diff) | |
| download | linux-e24f89e37bee8a11050ce87293814e2c86e3b330.tar.gz linux-e24f89e37bee8a11050ce87293814e2c86e3b330.tar.bz2 linux-e24f89e37bee8a11050ce87293814e2c86e3b330.zip | |
Merge tag 'v4.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt64
This contains the rk3368-geekbox as new board, mailbox device
nodes for the core rk3368 and some cleanups for gpio-keys,
mmc and tsadc.
* tag 'v4.7-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
Documentation: devicetree: rockchip: Document rk3368-GeekBox
arm64: dts: rockchip: Add rk3368 GeekBox dts
arm64: dts: rockchip: Clean up gpio-keys nodes
dt-bindings: Add vendor prefix for GeekBuying.com
arm64: dts: rockchip: Add rk3368 mailbox device nodes
arm64: dts: rockchip: remove broken-cd from emmc and sdio
arm64: dts: rockchip: fix the incorrect otp-out pin on rk3368
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -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 078c14fcdaaa..25495190db23 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.txt +++ b/Documentation/devicetree/bindings/arm/rockchip.txt @@ -39,6 +39,10 @@ Rockchip platforms device tree bindings Required root node properties: - compatible = "netxeon,r89", "rockchip,rk3288"; +- GeekBuying GeekBox: + Required root node properties: + - compatible = "geekbuying,geekbox", "rockchip,rk3368"; + - Google Brain (dev-board): Required root node properties: - compatible = "google,veyron-brain-rev0", "google,veyron-brain", |