From a28d2926942b4744a1a5d8e85310ae7f352c65a6 Mon Sep 17 00:00:00 2001 From: xff Date: Thu, 28 Mar 2019 10:57:02 +0800 Subject: [PATCH] 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 Reviewed-on: https://gerrit.mot.com/1329503 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Zhichao Chen Submit-Approved: Jira Key --- .../dts/exynos/exynos9610-robusta2-camera.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 = ; 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 = ; /* 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 = ; 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 */ -- 2.20.1