From: xff <fangfang.xu@samsung.com>
Date: Thu, 28 Mar 2019 02:57:02 +0000 (+0800)
Subject: arm64/dts: camera: Troika	: set rear default multi_ch to 2 and modify fimc_is_sensor2... 
X-Git-Tag: MMI-RSA31.Q1-48-36-11~154
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=801761351575d64de6445bf410aba0e24742ef87;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

arm64/dts: camera: Troika	: set rear default multi_ch to 2 and modify fimc_is_sensor2 to use dma3 ch

- related to cts test: android.hardware.camera2.cts.MultiViewTest#testDualCameraPreview

CRs-fixed: (CR)

Change-Id: Iea578f52632ffebc284bbbda503c2ed58f7a44dc
Signed-off-by: xff <fangfang.xu@samsung.com>
Reviewed-on: https://gerrit.mot.com/1329503
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Dawei Wang <wangdw10@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Submit-Approved: Jira Key
---

diff --git a/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi
index 2a67d0b77d01..1d90c3d307e5 100755
--- a/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi
@@ -713,7 +713,7 @@
 	flite_ch = <FLITE_ID_NOTHING>;
 	is_bns = <0>;
 	csi_mux = <0>;  /* CSIS_DPHY[2:0] = [0 0 0] */
-	multi_ch = <1>;
+	multi_ch = <2>;
 	use_ssvc1_internal;
 	use_ssvc2_internal;
 	status = "okay";
@@ -736,23 +736,23 @@
 &fimc_is_sensor2 {
 	scenario = <SENSOR_SCENARIO_NORMAL>;	/* Normal, Vision, OIS etc */
 	interrupts = <0 327 0>, /* MIPI-CSI2 */
-		<0 333 0>, /* VC0 DMA2 */
+		<0 334 0>, /* VC0 DMA3 */
 		<0 333 0>, /* VC1 DMA2 */
 		<0 333 0>, /* VC2 DMA2 */
 		<0 333 0>; /* VC3 DMA2 */
 	id = <2>;
 	csi_ch = <2>;
-	dma_ch = <2 2 2 2>;
-	vc_ch = <0 1 2 3>;
+	dma_ch = <3 2 2 2>;
+	vc_ch = <1 1 2 3>;
 	flite_ch = <FLITE_ID_NOTHING>;
 	is_bns = <0>;
 	csi_mux = <0>;  /* CSIS_DPHY[2:0] = [0 0 0] */
 	multi_ch = <0>;
-	camif_mux_val = <0x000020FF>;
+	camif_mux_val = <0x005820FF>;
 	status = "okay";
 	sensor2_ch_mode0: sensor2-ch-mode0 {
-		reg = <0x14470000 0x100>, /* VC0 DMA2 */
-			<0x14470400 0x100>, /* VC0 DMA2 COMMON */
+		reg = <0x14480100 0x100>, /* VC0 DMA3 */
+			<0x14480400 0x100>, /* VC0 DMA3 COMMON */
 			<0x14470100 0x100>, /* VC1 DMA2 */
 			<0x14470400 0x100>, /* VC1 DMA2 COMMON */
 			<0x14470200 0x100>, /* VC2 DMA2 */