From 847bb599e277eda8053b3a653c1f40b51308c134 Mon Sep 17 00:00:00 2001
From: Zhenke Fan <fanzy.fan@rock-chips.com>
Date: Tue, 10 Nov 2020 15:42:03 +0800
Subject: [PATCH] ARM: dts: rv1126-ai-cam.dtsi: modify link to cif by default

imx378 need to change the data lanes from <1 2> to <1 2 3 4>

Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Ifeb88250c7e01a4da84b67a0e77adcf0124201a9
---
 arch/arm/boot/dts/rv1126-ai-cam.dtsi | 102 ++++++++++++++++++++++-----
 1 file changed, 83 insertions(+), 19 deletions(-)

diff --git a/arch/arm/boot/dts/rv1126-ai-cam.dtsi b/arch/arm/boot/dts/rv1126-ai-cam.dtsi
index 3bd15aa73eac..11d318b7cc8a 100644
--- a/arch/arm/boot/dts/rv1126-ai-cam.dtsi
+++ b/arch/arm/boot/dts/rv1126-ai-cam.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd.
+ * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
  */
 
 #include <dt-bindings/display/drm_mipi_dsi.h>
@@ -113,7 +113,8 @@
 
 			csidphy0_out: endpoint@0 {
 				reg = <0>;
-				remote-endpoint = <&isp_in>;
+				remote-endpoint = <&mipi_csi2_input>;
+				data-lanes = <1 2>;
 			};
 		};
 	};
@@ -139,6 +140,39 @@
 	status = "okay";
 };
 
+&mipi_csi2 {
+	status = "okay";
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipi_csi2_input: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&csidphy0_out>;
+				data-lanes = <1 2>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipi_csi2_output: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&cif_mipi_in>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+};
+
 &mpp_srv {
 	status = "okay";
 };
@@ -247,46 +281,76 @@
 	status = "okay";
 };
 
-&rkisp {
+&rkcif {
 	status = "okay";
 };
 
-&rkisp_vir0 {
+&rkcif_mipi_lvds {
 	status = "okay";
 
-	ports {
-		port@0 {
-			reg = <0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			isp_in: endpoint@0 {
-				reg = <0>;
-				remote-endpoint = <&csidphy0_out>;
-			};
+	port {
+		/* MIPI CSI-2 endpoint */
+		cif_mipi_in: endpoint {
+			remote-endpoint = <&mipi_csi2_output>;
+			data-lanes = <1 2>;
 		};
 	};
 };
 
+&rkcif_mipi_lvds_sditf {
+	status = "okay";
+
+	port {
+		cif_sditf: endpoint {
+			remote-endpoint = <&isp_virt1_in>;
+			data-lanes = <1 2>;
+		};
+	};
+};
+
+&rkcif_mmu {
+	status = "disabled";
+};
+
+&rkisp {
+	status = "okay";
+};
+
 &rkisp_mmu {
 	status = "disabled";
 };
 
+&rkisp_vir0 {
+	status = "okay";
+	ports {
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			isp_virt1_in: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&cif_sditf>;
+			};
+		};
+	};
+};
+
 &rkispp {
 	rockchip,restart-monitor-en;
 	status = "okay";
 	/* the max input w h and fps of mulit sensor */
-	//max-input = <2688 1520 30>;
-};
-
-&rkispp_vir0 {
-	status = "okay";
+	//max-input = <3840 2160 30>;
 };
 
 &rkispp_mmu {
 	status = "okay";
 };
 
+&rkispp_vir0 {
+	status = "okay";
+};
+
 &rkvdec {
 	status = "okay";
 };