UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB: mx2_camera: remove emma limitation for RGB565 

In the current source status the emma has no limitation for any PIXFMT
since the data is parsed raw and unprocessed into the memory.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Grzeschik 2010-08-09 11:57:04 -03:00 committed by Mauro Carvalho Chehab
parent ec73365bd4
commit 7c3a2066aa
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/video/mx2_camera.c
View File

@ -716,8 +716,11 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd,
/* /*
* We only use the EMMA engine to get rid of the broken * We only use the EMMA engine to get rid of the broken
* DMA Engine. No color space consversion at the moment. * DMA Engine. No color space consversion at the moment.
* We adjust incoming and outgoing pixelformat to rgb16 * We set the incomming and outgoing pixelformat to an
* and adjust the bytesperline accordingly. * 16 Bit wide format and adjust the bytesperline
* accordingly. With this configuration the inputdata
* will not be changed by the emma and could be any type
* of 16 Bit Pixelformat.
*/ */
writel(PRP_CNTL_CH1EN | writel(PRP_CNTL_CH1EN |
PRP_CNTL_CSIEN | PRP_CNTL_CSIEN |
@ -903,10 +906,6 @@ static int mx2_camera_set_fmt(struct soc_camera_device *icd,
return -EINVAL; return -EINVAL;
} }
/* eMMA can only do RGB565 */
if (mx27_camera_emma(pcdev) && pix->pixelformat != V4L2_PIX_FMT_RGB565)
return -EINVAL;
mf.width = pix->width; mf.width = pix->width;
mf.height = pix->height; mf.height = pix->height;
mf.field = pix->field; mf.field = pix->field;
@ -950,10 +949,6 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,
/* FIXME: implement MX27 limits */ /* FIXME: implement MX27 limits */
/* eMMA can only do RGB565 */
if (mx27_camera_emma(pcdev) && pixfmt != V4L2_PIX_FMT_RGB565)
return -EINVAL;
/* limit to MX25 hardware capabilities */ /* limit to MX25 hardware capabilities */
if (cpu_is_mx25()) { if (cpu_is_mx25()) {
if (xlate->host_fmt->bits_per_sample <= 8) if (xlate->host_fmt->bits_per_sample <= 8)