bb2a7f14aa3102c6571df72aac2581e49e32dd79
[openembedded.git] /
1 From e069619a821aca3569440a4d8ccf3727ebe80ddd Mon Sep 17 00:00:00 2001
2 From: Sergio Aguirre <saaguirre@ti.com>
3 Date: Sat, 10 Jul 2010 09:51:16 -0500
4 Subject: [PATCH 35/75] omap3isp: Fix bad YUV_BT checks in datapath_config
5
6 The use of an external write enable signals (from ISP point of
7 view) shouldn't depend on the sensor parallel interface type.
8
9 Also, the bit shift selection should NOT be other than 9_0 by
10 default (i.e. No shift).
11
12 Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
13 ---
14  drivers/media/video/isp/ispccdc.c |   15 +++++----------
15  1 files changed, 5 insertions(+), 10 deletions(-)
16
17 diff --git a/drivers/media/video/isp/ispccdc.c b/drivers/media/video/isp/ispccdc.c
18 index 137a5e6..ea6d87c 100644
19 --- a/drivers/media/video/isp/ispccdc.c
20 +++ b/drivers/media/video/isp/ispccdc.c
21 @@ -602,16 +602,11 @@ static int ispccdc_config_datapath(struct isp_ccdc_device *isp_ccdc,
22                 syn_mode &= ~ISPCCDC_SYN_MODE_VP2SDR;
23                 syn_mode &= ~ISPCCDC_SYN_MODE_SDR2RSZ;
24                 syn_mode |= ISPCCDC_SYN_MODE_WEN;
25 -               if (pipe->ccdc_in == CCDC_YUV_BT) {
26 -                       syn_mode &= ~ISPCCDC_SYN_MODE_EXWEN;
27 -                       isp_reg_and(isp_ccdc->dev, OMAP3_ISP_IOMEM_CCDC,
28 -                                       ISPCCDC_CFG, ~ISPCCDC_CFG_WENLOG);
29 -               } else {
30 -                       syn_mode |= ISPCCDC_SYN_MODE_EXWEN;
31 -                       isp_reg_or(isp_ccdc->dev, OMAP3_ISP_IOMEM_CCDC,
32 -                                       ISPCCDC_CFG, ISPCCDC_CFG_WENLOG);
33 -               }
34 -               vpcfg.bitshift_sel = BIT11_2;
35 +               syn_mode &= ~ISPCCDC_SYN_MODE_EXWEN;
36 +
37 +               isp_reg_and(isp_ccdc->dev, OMAP3_ISP_IOMEM_CCDC,
38 +                               ISPCCDC_CFG, ~ISPCCDC_CFG_WENLOG);
39 +               vpcfg.bitshift_sel = BIT9_0;
40                 vpcfg.freq_sel = PIXCLKBY2;
41                 ispccdc_config_vp(isp_ccdc, vpcfg);
42                 ispccdc_enable_vp(isp_ccdc, 0);
43 -- 
44 1.6.6.1
45