aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2019-05-08 21:06:50 +0530
committerManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2019-05-08 21:06:50 +0530
commitf2ab27a7a82c19bb648273732ce9abbd7604a698 (patch)
treead5bb3ddf0faebb7b2a6a2252f38445daea362ae
parentbb64d1200901e32c87b351bc6fd3d0ea67559605 (diff)
download96b-common-camera_test.tar.gz
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi16
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399.dtsi4
2 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 3d84acaa7d42..eb4ffe6060cf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -379,10 +379,10 @@
vdddo-supply = <&camera_vdddo_1v8>;
vdda-supply = <&camera_vdda_2v8>;
vddd-supply = <&camera_vddd_1v5>;
- pinctrl-0 = <&cam0_default_pins>;
+ pinctrl-0 = <&cam0_default_pins &cif_clkout>;
pinctrl-names = "default";
- enable-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
+ enable-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
port {
ov5645_0_out: endpoint {
@@ -416,8 +416,10 @@
vddd-supply = <&camera_vddd_1v5>;
pinctrl-0 = <&cam0_default_pins>;
pinctrl-names = "default";
- enable-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
- reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_LOW>;
+ // enable-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
+ // reset-gpios = <&gpio1 RK_PC7 GPIO_ACTIVE_LOW>;
+ reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
+ enable-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
port {
ov5645_1_out: endpoint {
@@ -558,6 +560,12 @@
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
<1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
};
+ cif_clkout: cif-clkout {
+ rockchip,pins =
+ /* cif_clkout */
+ <2 11 RK_FUNC_3 &pcfg_pull_none>;
+ };
+
};
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 04ddd9e48388..278355c52de4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2165,8 +2165,8 @@
i2c2 {
i2c2_xfer: i2c2-xfer {
rockchip,pins =
- <2 1 RK_FUNC_2 &pcfg_pull_none_20ma>,
- <2 0 RK_FUNC_2 &pcfg_pull_none_20ma>;
+ <2 1 RK_FUNC_2 &pcfg_pull_none>,
+ <2 0 RK_FUNC_2 &pcfg_pull_none>;
};
};