diff options
author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2010-08-09 10:57:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:17 -0400 |
commit | 7c3a2066aa99b9e6c725803fd153ee8895219dba (patch) | |
tree | 450372da4941fa6c842fc6be8f6b962e9c2f2787 /drivers/media/video/mx2_camera.c | |
parent | ec73365bd47bb7e113f66d0d617676722c9447b1 (diff) |
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>
Diffstat (limited to 'drivers/media/video/mx2_camera.c')
-rw-r--r-- | drivers/media/video/mx2_camera.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 38d09474da13..3fba60036eb2 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c | |||
@@ -716,8 +716,11 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd, | |||
716 | /* | 716 | /* |
717 | * We only use the EMMA engine to get rid of the broken | 717 | * We only use the EMMA engine to get rid of the broken |
718 | * DMA Engine. No color space consversion at the moment. | 718 | * DMA Engine. No color space consversion at the moment. |
719 | * We adjust incoming and outgoing pixelformat to rgb16 | 719 | * We set the incomming and outgoing pixelformat to an |
720 | * and adjust the bytesperline accordingly. | 720 | * 16 Bit wide format and adjust the bytesperline |
721 | * accordingly. With this configuration the inputdata | ||
722 | * will not be changed by the emma and could be any type | ||
723 | * of 16 Bit Pixelformat. | ||
721 | */ | 724 | */ |
722 | writel(PRP_CNTL_CH1EN | | 725 | writel(PRP_CNTL_CH1EN | |
723 | PRP_CNTL_CSIEN | | 726 | PRP_CNTL_CSIEN | |
@@ -903,10 +906,6 @@ static int mx2_camera_set_fmt(struct soc_camera_device *icd, | |||
903 | return -EINVAL; | 906 | return -EINVAL; |
904 | } | 907 | } |
905 | 908 | ||
906 | /* eMMA can only do RGB565 */ | ||
907 | if (mx27_camera_emma(pcdev) && pix->pixelformat != V4L2_PIX_FMT_RGB565) | ||
908 | return -EINVAL; | ||
909 | |||
910 | mf.width = pix->width; | 909 | mf.width = pix->width; |
911 | mf.height = pix->height; | 910 | mf.height = pix->height; |
912 | mf.field = pix->field; | 911 | mf.field = pix->field; |
@@ -950,10 +949,6 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd, | |||
950 | 949 | ||
951 | /* FIXME: implement MX27 limits */ | 950 | /* FIXME: implement MX27 limits */ |
952 | 951 | ||
953 | /* eMMA can only do RGB565 */ | ||
954 | if (mx27_camera_emma(pcdev) && pixfmt != V4L2_PIX_FMT_RGB565) | ||
955 | return -EINVAL; | ||
956 | |||
957 | /* limit to MX25 hardware capabilities */ | 952 | /* limit to MX25 hardware capabilities */ |
958 | if (cpu_is_mx25()) { | 953 | if (cpu_is_mx25()) { |
959 | if (xlate->host_fmt->bits_per_sample <= 8) | 954 | if (xlate->host_fmt->bits_per_sample <= 8) |