]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
media: tegra_v4l2_camera: disable line timeout
authorBryan Wu <pengw@nvidia.com>
Wed, 24 Sep 2014 23:40:17 +0000 (16:40 -0700)
committerWinnie Hsu <whsu@nvidia.com>
Thu, 8 Jan 2015 02:06:30 +0000 (18:06 -0800)
Disable line timeout, since some sensor like IMX208 doesn't work with
line timeout enabled.

Bug 1560636

Change-Id: I38e9a03e04ca206cbb65c13829c567d0c0de1c6c
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/539004
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
(cherry picked from commit 8cca4a716c25cecbbc7455d5dd92f3e7fc074b07)
Reviewed-on: http://git-master/r/665997
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
drivers/media/platform/soc_camera/tegra_camera/vi2.c

index 8937eb813ea725289d05d63f5714b0888b3696ee..ec42bb96090bbf6fb2e0083aacf2e8e9fac020a0 100644 (file)
@@ -557,6 +557,7 @@ static int vi2_capture_setup_csi_0(struct tegra_camera_dev *cam,
        TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_PPA_COMMAND, 0xf007);
        TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_A_CONTROL1, 0x11);
        TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_A_GAP, 0x140000);
+       TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_A_EXPECTED_FRAME, 0x0);
 
        TC_VI_REG_WT(cam, TEGRA_CSI_INPUT_STREAM_A_CONTROL,
                        0x3f0000 | (pdata->lanes - 1));
@@ -634,6 +635,7 @@ static int vi2_capture_setup_csi_1(struct tegra_camera_dev *cam,
        TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_PPB_COMMAND, 0xf007);
        TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_B_CONTROL1, 0x11);
        TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_B_GAP, 0x140000);
+       TC_VI_REG_WT(cam, TEGRA_CSI_PIXEL_STREAM_B_EXPECTED_FRAME, 0x0);
 
        TC_VI_REG_WT(cam, TEGRA_CSI_INPUT_STREAM_B_CONTROL,
                        0x3f0000 | (pdata->lanes - 1));