From 8b01a475af925e75542e096e2a6520f2a642db0d Mon Sep 17 00:00:00 2001 From: Wooyeon Kim Date: Thu, 27 Dec 2018 18:33:21 +0900 Subject: [PATCH] [9610][Robusta2] dtsi: camera: modified settings for support PAFSTAT - modified stat DMA out to DMA2 CH0 at rear sensor - moved Rear2 DMA out to DMA3 CH0 PR JIRA ID: CPR-532 Change-Id: I560cb01896a1529ca261bb2883efe19bac91f7cc Signed-off-by: Wooyeon Kim --- arch/arm64/boot/dts/exynos/exynos9610-camera.dtsi | 12 ++++++------ .../boot/dts/exynos/exynos9610-robusta2-camera.dtsi | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9610-camera.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-camera.dtsi index abd1aa56c5ee..694140392fe9 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610-camera.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610-camera.dtsi @@ -149,7 +149,7 @@ <0 331 0>, /* VC0 DMA0 */ <0 332 0>, /* VC1 DMA1 */ - <0 332 0>, /* VC2 DMA1 */ + <0 333 0>, /* VC0 DMA2 for PAFSTAT */ <0 332 0>; /* VC3 DMA1 */ interrupt-names = "csi", "mode0_VC0", "mode0_VC1","mode0_VC2","mode0_VC3", @@ -204,8 +204,8 @@ <0x14450400 0x100>, /* VC0 DMA0 COMMON */ <0x14460100 0x100>, /* VC1 DMA1 */ <0x14460400 0x100>, /* VC1 DMA1 COMMON */ - <0x14460200 0x100>, /* VC2 DMA1 */ - <0x14460400 0x100>, /* VC2 DMA1 COMMON */ + <0x14470000 0x100>, /* VC0 DMA2 for PAFSTAT */ + <0x14470400 0x100>, /* VC0 DMA2 COMMON */ <0x14460300 0x100>, /* VC3 DMA1 */ <0x14460400 0x100>; /* VC3 DMA1 COMMON */ }; @@ -302,7 +302,7 @@ <0x0 0x14420700 0x100>; /* PHY: TOP_M4S4S4_2nd */ reg-names = "csi", "phy"; 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 */ @@ -342,8 +342,8 @@ /* without PAF HW */ sensor2_ch_mode0: sensor2-ch-mode0 { - reg = <0x14470000 0x100>, /* VC0 DMA2 */ - <0x14470400 0x100>, /* VC0 DMA2 COMMON */ + reg = <0x14480000 0x100>, /* VC0 DMA3 */ + <0x14480400 0x100>, /* VC0 DMA3 COMMON */ <0x14470100 0x100>, /* VC1 DMA2 */ <0x14470400 0x100>, /* VC1 DMA2 COMMON */ <0x14470200 0x100>, /* VC2 DMA2 */ diff --git a/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi index cdf01660e862..faa2fc8add1e 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9610-robusta2-camera.dtsi @@ -59,7 +59,7 @@ }; internal_vc { - /* DUMMY */ + vc_list = <2 VC_MIPISTAT 0 3 VC_PRIVATE 0>; }; }; @@ -623,13 +623,13 @@ scenario = ; /* Normal, Vision, OIS etc */ id = <0>; csi_ch = <0>; - dma_ch = <0 0 0 0 0 1 1 1>; - vc_ch = <0 1 2 3 0 1 2 3>; + dma_ch = <0 0 0 0 0 0 2 0>; + vc_ch = <0 1 2 3 0 1 0 3>; flite_ch = ; is_bns = <0>; csi_mux = <0>; /* CSIS_DPHY[2:0] = [0 0 0] */ - /* use_ssvc1_internal; */ - /* use_ssvc2_internal; */ + use_ssvc2_internal; + use_ssvc3_internal; status = "okay"; }; @@ -650,7 +650,7 @@ scenario = ; /* Normal, Vision, OIS etc */ id = <2>; csi_ch = <2>; - dma_ch = <2 2 2 2>; + dma_ch = <3 2 2 2>; vc_ch = <0 1 2 3>; flite_ch = ; is_bns = <0>; -- 2.20.1