From: Bhanu Murthy V <bmurthyv@nvidia.com>
Date: Mon, 21 Mar 2016 21:02:09 +0000 (-0700)
Subject: arch: arm64: boot: dts: VI mode updates
X-Git-Tag: tegra-l4t-r24.1~11
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/nv-tegra/linux-3.10.git/commitdiff_plain/c39b9509339394961a3e83be40d34ab0df4a4d18

arch: arm64: boot: dts: VI mode updates

Fix E3333 label entries.
Add csi information required for VI mode in
individual DT and plug-in manager for E3333,
E3322 and E3323 modules.

Bug 1736471

Change-Id: I340604b1efe8ccf5895883ad53ee8466d13efa45
Signed-off-by: Bhanu Murthy V <bmurthyv@nvidia.com>
Reviewed-on: http://git-master/r/1113879
(cherry picked from commit 0c10cd3de33ee28b4a5c982172f0b303a408781a)
Reviewed-on: http://git-master/r/1112632
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Jihoon Bang <jbang@nvidia.com>
(cherry picked from commit f417dd36385cc00be09ccb6f3736028e5915adf8)
Reviewed-on: http://git-master/r/1119312
GVS: Gerrit_Virtual_Submit
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
---

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3333-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3333-a00.dtsi
index 8c5d63eab44..341ec8f9eb0 100644
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3333-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-camera-e3333-a00.dtsi
@@ -29,37 +29,49 @@
 				port@0 {
 					reg = <0>;
 					e3333_vi_in0: endpoint {
-						remote-endpoint = <&ov5693_out0>;
+						csi-port = <0>;
+						bus-width = <2>;
+						remote-endpoint = <&e3333_ov5693_out0>;
 					};
 				};
 				port@1 {
 					reg = <1>;
 					e3333_vi_in1: endpoint {
-						remote-endpoint = <&ov5693_out1>;
+						csi-port = <1>;
+						bus-width = <2>;
+						remote-endpoint = <&e3333_ov5693_out1>;
 					};
 				};
 				port@2 {
 					reg = <2>;
 					e3333_vi_in2: endpoint {
-						remote-endpoint = <&ov5693_out2>;
+						csi-port = <2>;
+						bus-width = <2>;
+						remote-endpoint = <&e3333_ov5693_out2>;
 					};
 				};
 				port@3 {
 					reg = <3>;
 					e3333_vi_in3: endpoint {
-						remote-endpoint = <&ov5693_out3>;
+						csi-port = <3>;
+						bus-width = <2>;
+						remote-endpoint = <&e3333_ov5693_out3>;
 					};
 				};
 				port@4 {
 					reg = <4>;
 					e3333_vi_in4: endpoint {
-						remote-endpoint = <&ov5693_out4>;
+						csi-port = <4>;
+						bus-width = <2>;
+						remote-endpoint = <&e3333_ov5693_out4>;
 					};
 				};
 				port@5 {
 					reg = <5>;
 					e3333_vi_in5: endpoint {
-						remote-endpoint = <&ov5693_out5>;
+						csi-port = <5>;
+						bus-width = <2>;
+						remote-endpoint = <&e3333_ov5693_out5>;
 					};
 				};
 			};
diff --git a/arch/arm64/boot/dts/tegra210-plugin-manager/tegra210-jetson-cv-camera-plugin-manager.dtsi b/arch/arm64/boot/dts/tegra210-plugin-manager/tegra210-jetson-cv-camera-plugin-manager.dtsi
index 5dd23df4926..f35e812b707 100644
--- a/arch/arm64/boot/dts/tegra210-plugin-manager/tegra210-jetson-cv-camera-plugin-manager.dtsi
+++ b/arch/arm64/boot/dts/tegra210-plugin-manager/tegra210-jetson-cv-camera-plugin-manager.dtsi
@@ -114,6 +114,8 @@
 				target = <&vi_in0>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <0>;
+					bus-width = <4>;
 					remote-endpoint = <&ov23850_out0>;
 				};
 			};
@@ -127,6 +129,8 @@
 				target = <&vi_in1>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <2>;
+					bus-width = <4>;
 					remote-endpoint = <&ov23850_out1>;
 				};
 			};
@@ -329,6 +333,8 @@
 				target = <&vi_in0>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <0>;
+					bus-width = <2>;
 					remote-endpoint = <&imx219_out0>;
 				};
 			};
@@ -342,6 +348,8 @@
 				target = <&vi_in1>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <1>;
+					bus-width = <2>;
 					remote-endpoint = <&imx219_out1>;
 				};
 			};
@@ -355,6 +363,8 @@
 				target = <&vi_in2>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <2>;
+					bus-width = <2>;
 					remote-endpoint = <&imx219_out2>;
 				};
 			};
@@ -368,6 +378,8 @@
 				target = <&vi_in3>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <3>;
+					bus-width = <2>;
 					remote-endpoint = <&imx219_out3>;
 				};
 			};
@@ -381,6 +393,8 @@
 				target = <&vi_in4>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <4>;
+					bus-width = <2>;
 					remote-endpoint = <&imx219_out4>;
 				};
 			};
@@ -394,6 +408,8 @@
 				target = <&vi_in5>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <5>;
+					bus-width = <2>;
 					remote-endpoint = <&imx219_out5>;
 				};
 			};
@@ -584,6 +600,8 @@
 				target = <&e3333_vi_in0>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <0>;
+					bus-width = <2>;
 					remote-endpoint = <&e3333_ov5693_out0>;
 				};
 			};
@@ -597,6 +615,8 @@
 				target = <&vi_in1>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <1>;
+					bus-width = <2>;
 					remote-endpoint = <&e3333_ov5693_out1>;
 				};
 			};
@@ -610,6 +630,8 @@
 				target = <&vi_in2>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <2>;
+					bus-width = <2>;
 					remote-endpoint = <&e3333_ov5693_out2>;
 				};
 			};
@@ -623,6 +645,8 @@
 				target = <&vi_in3>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <3>;
+					bus-width = <2>;
 					remote-endpoint = <&e3333_ov5693_out3>;
 				};
 			};
@@ -636,6 +660,8 @@
 				target = <&vi_in4>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <4>;
+					bus-width = <2>;
 					remote-endpoint = <&e3333_ov5693_out4>;
 				};
 			};
@@ -649,6 +675,8 @@
 				target = <&vi_in5>;
 				_overlay_ {
 					status = "okay";
+					csi-port = <5>;
+					bus-width = <2>;
 					remote-endpoint = <&e3333_ov5693_out5>;
 				};
 			};