diff options
| author | Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2018-11-21 12:12:00 +0530 |
|---|---|---|
| committer | Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2018-11-21 15:41:47 +0530 |
| commit | 9b5adfbbc1b8e56973ed3e01f6afbdb18cdee23d (patch) | |
| tree | 7c7931e6c8798acaac04614d3a1d7ba7a9c48b66 | |
| parent | 332d9a61dcfce0315d220b961aaa9f834faa28b4 (diff) | |
| download | 96b-common-release-4.4-rock960.tar.gz | |
arm64: dts: rock960-model-ab: Modify camera node to support J3 connectorrelease-4.4-rock960
Modify the power down and reset pins for using the OV5645 camera
connected to the J3 connector on Deltavision MIPI adapter.
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rock960-model-ab-linux.dts | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi index ecbac79d5ed0..05ddf4452cfa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -217,12 +217,16 @@ cam0_default_pins: cam0-default-pins { rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>, - <2 11 RK_FUNC_3 &pcfg_pull_none>; + <2 11 RK_FUNC_3 &pcfg_pull_none>, + <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>, + <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; cam0_sleep_pins: cam0-sleep-pins { rockchip,pins = <4 27 RK_FUNC_3 &pcfg_pull_none>, - <2 11 RK_FUNC_GPIO &pcfg_pull_none>; + <2 11 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>, + <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rock960-model-ab-linux.dts b/arch/arm64/boot/dts/rockchip/rock960-model-ab-linux.dts index 8d78d4a9e68a..14e3d0501d33 100644 --- a/arch/arm64/boot/dts/rockchip/rock960-model-ab-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rock960-model-ab-linux.dts @@ -594,9 +594,9 @@ clock-names = "xvclk"; pinctrl-names = "rockchip,camera_default"; - pinctrl-0 = <&cif_clkout>; - reset-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>; - pwdn-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&cif_clkout>, <&cam0_default_pins>; + reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; + pwdn-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; port { ucam_out2: endpoint { |