diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-08-31 11:03:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-11 16:02:56 -0300 |
| commit | c51364cafa26dca2022f9b31da1c41e27c306c47 (patch) | |
| tree | ca9c16f27c21c1c368b539671ff7a57d7d9e3a86 /drivers/media/video/omap3isp/isp.c | |
| parent | 73ea57eb5442aece696a7a03e2cd4509d38e55fd (diff) | |
| download | blackbird-op-linux-c51364cafa26dca2022f9b31da1c41e27c306c47.tar.gz blackbird-op-linux-c51364cafa26dca2022f9b31da1c41e27c306c47.zip | |
[media] omap3isp: ccdc: Add YUV input formats support
Enable the bridge automatically when the input format is YUYV8 or UYVY8.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/video/omap3isp/isp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c index 36805ca72688..e0096e07dbdc 100644 --- a/drivers/media/video/omap3isp/isp.c +++ b/drivers/media/video/omap3isp/isp.c @@ -293,7 +293,7 @@ static void isp_core_init(struct isp_device *isp, int idle) void omap3isp_configure_bridge(struct isp_device *isp, enum ccdc_input_entity input, const struct isp_parallel_platform_data *pdata, - unsigned int shift) + unsigned int shift, unsigned int bridge) { u32 ispctrl_val; @@ -302,12 +302,12 @@ void omap3isp_configure_bridge(struct isp_device *isp, ispctrl_val &= ~ISPCTRL_PAR_CLK_POL_INV; ispctrl_val &= ~ISPCTRL_PAR_SER_CLK_SEL_MASK; ispctrl_val &= ~ISPCTRL_PAR_BRIDGE_MASK; + ispctrl_val |= bridge; switch (input) { case CCDC_INPUT_PARALLEL: ispctrl_val |= ISPCTRL_PAR_SER_CLK_SEL_PARALLEL; ispctrl_val |= pdata->clk_pol << ISPCTRL_PAR_CLK_POL_SHIFT; - ispctrl_val |= pdata->bridge << ISPCTRL_PAR_BRIDGE_SHIFT; shift += pdata->data_lane_shift * 2; break; |
