diff options
| author | Weixin Zhou <zwx@rock-chips.com> | 2019-06-21 09:17:10 +0800 |
|---|---|---|
| committer | Tao Huang <huangtao@rock-chips.com> | 2019-06-24 14:19:34 +0800 |
| commit | bdde6c77bb1c46ba41ea9c794402dd05499daebf (patch) | |
| tree | f7227a802a43d2872018997d8f77ad229f8e3902 | |
| parent | b45124d8885964b1dec3135d04dd0f87381cd799 (diff) | |
arm64: dts: rockchip: rk3399pro-evb-v13-multi-cam: for multi camera board
Change-Id: I82bd22191a61523bfeec11218fd36a856e9265dc
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/rockchip.txt | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399pro-evb-v13-multi-cam.dts | 31 |
3 files changed, 34 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt index 4066ad478d2a..5b509c18599d 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.txt +++ b/Documentation/devicetree/bindings/arm/rockchip.txt @@ -134,7 +134,8 @@ Rockchip platforms device tree bindings - compatible = "rockchip,rk3399pro-evb-v10-avb", "rockchip,rk3399pro"; - compatible = "rockchip,rk3399pro-evb-v11-avb", "rockchip,rk3399pro"; - compatible = "rockchip,rk3399pro-evb-lp4-v11-avb", "rockchip,rk3399pro"; - - compatible = "rockchip,rk3399pro-evb-lp4-v11-multi-cam-avb", "rockchip,rk3399pro"; + - compatible = "rockchip,rk3399pro-evb-v11-multi-cam-avb", "rockchip,rk3399pro"; + - compatible = "rockchip,rk3399pro-evb-v13-multi-cam", "rockchip,rk3399pro"; - Rockchip RK3326 f863 board: Required root node properties: diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index b878c2377174..41f10b33278e 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -120,6 +120,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11-avb.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11-linux.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v11-multi-cam-avb.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-evb-v13-multi-cam.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-npu-evb-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-npu-evb-v10-multi-cam.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v13-multi-cam.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v13-multi-cam.dts new file mode 100644 index 000000000000..70eceacafa78 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v13-multi-cam.dts @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. + +#include "rk3399pro-evb-v11.dts" + +/ { + model = "Rockchip RK3399pro evb v13 multi camera board"; + compatible = "rockchip,rk3399pro-evb-v13-multi-cam", "rockchip,rk3399pro"; + + dma_trans: dma_trans@3c000000 { + //no-map; + reg = <0x0 0x3c000000 0x0 0x04000000>; + }; +}; + +&pcie_phy { + status = "okay"; +}; + +&pcie0 { + /delete-property/ ep-gpios; + num-lanes = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_clkreqn_cpm>; + max-link-speed = <2>; + memory-region = <&dma_trans>; + busno = <0>; + rockchip,dma_trx_enabled = <1>; + rockchip,deferred = <1>; + status = "okay"; +}; |