Skip to content

Commit

Permalink
V4L/DVB: mx2_camera: remove emma limitation for RGB565
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Grzeschik authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent ec73365 commit 7c3a206
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/media/video/mx2_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* DMA Engine. No color space consversion at the moment.
* We adjust incoming and outgoing pixelformat to rgb16
* and adjust the bytesperline accordingly.
* We set the incomming and outgoing pixelformat to an
* 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 |
PRP_CNTL_CSIEN |
Expand Down Expand Up @@ -903,10 +906,6 @@ static int mx2_camera_set_fmt(struct soc_camera_device *icd,
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.height = pix->height;
mf.field = pix->field;
Expand Down Expand Up @@ -950,10 +949,6 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd,

/* 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 */
if (cpu_is_mx25()) {
if (xlate->host_fmt->bits_per_sample <= 8)
Expand Down

0 comments on commit 7c3a206

Please sign in to comment.