From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JMCC <JMCC@localhost>
Date: Tue, 29 Dec 2020 19:26:31 +0100
Subject: rockpi4b-add-isp-camera

Signed-off-by: JMCC <JMCC@localhost>
---
 arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts | 35 +++++++---
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
index 5cc57e16b86a..09ac9eb89b65 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts
@@ -633,10 +633,8 @@
 };
 
 &i2c4 {
-	status = "okay";
-
 	camera1: camera-module@10 {
-		status = "okay";
+		status = "disabled";
 		compatible = "sony,imx219";
 		reg = <0x10>;
 
@@ -644,7 +642,7 @@
 		clock-names = "clk_cif_out";
 		pinctrl-names = "rockchip,camera_default";
 		pwdn-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-		
+
 		port {
 			ucam_out0: endpoint {
 				remote-endpoint = <&mipi_in_ucam0>;
@@ -652,6 +650,23 @@
 			};
 		};
 	};
+
+	camera2: camera-module@36 {
+		status = "disabled";
+		compatible = "ovti,ov5647";
+		reg = <0x36>;
+
+		clocks = <&cru SCLK_CIF_OUT>;
+		clock-names = "clk_cif_out";
+		pinctrl-names = "rockchip,camera_default";
+
+		port {
+			ucam_out1: endpoint {
+				remote-endpoint = <&mipi_in_ucam0>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
 };
 
 &i2c2 {
@@ -1089,11 +1104,12 @@
 		};
 	};
 
-	i2c4 {                                                                 
+	i2c4 {
 		i2c4_xfer: i2c4-xfer {
 			rockchip,pins =
 				<1 12 RK_FUNC_1 &pcfg_pull_up>,
-				<1 11 RK_FUNC_1 &pcfg_pull_up>;
+				<1 11 RK_FUNC_1 &pcfg_pull_up>,
+				<1 13 RK_FUNC_GPIO &pcfg_pull_up>;	//camera module enable pin
 		};
 	};
 	i2s0 {
@@ -1172,8 +1188,7 @@
 };
 
 &rkisp1_0 {
-	// TODO: this crashes kernel
-	status = "disabled";
+	status = "okay";
 	port {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -1186,8 +1201,7 @@
 };
 
 &mipi_dphy_rx0 {
-	// TODO: this crashes kernel
-	status = "disabled";
+	status = "okay";
 
 	ports {
 		#address-cells = <1>;
@@ -1218,6 +1232,7 @@
 	};
 };
 
+
 &isp0_mmu {
 	status = "okay";
 };
-- 
Armbian