From 663f877277a7d361d7ea4a5ef5f562bf0b454521 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 30 Jun 2009 08:36:17 -0300
Subject: [PATCH] --- yaml --- r: 154946 b: refs/heads/master c:
 43cb9fe3291bb96390c1d188eb61c2d1581bb61e h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/em28xx/em28xx-video.c | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3fb86ab8db8a..f30c2c27d665 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02e7804b2135ff941b8846f5820cf48fbfdadd54
+refs/heads/master: 43cb9fe3291bb96390c1d188eb61c2d1581bb61e
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 8fe1beecfffa..b96a138d9d03 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -94,6 +94,11 @@ static struct em28xx_fmt format[] = {
 		.fourcc   = V4L2_PIX_FMT_YUYV,
 		.depth    = 16,
 		.reg	  = EM28XX_OUTFMT_YUV422_Y0UY1V,
+	}, {
+		.name     = "16 bpp RGB, le",
+		.fourcc   = V4L2_PIX_FMT_RGB565,
+		.depth    = 16,
+		.reg      = EM28XX_OUTFMT_YUV211,
 	},
 };
 
@@ -694,6 +699,10 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 	unsigned int          hscale, vscale;
 	struct em28xx_fmt     *fmt;
 
+	/* FIXME: This is the only supported fmt */
+	if (dev->board.is_27xx)
+		f->fmt.pix.pixelformat = V4L2_PIX_FMT_RGB565;
+
 	fmt = format_by_fourcc(f->fmt.pix.pixelformat);
 	if (!fmt) {
 		em28xx_videodbg("Fourcc format (%08x) invalid.\n",
@@ -701,7 +710,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 		return -EINVAL;
 	}
 
-	if (dev->board.is_em2800) {
+	if (dev->board.is_27xx) {
+		/* FIXME: This is the only supported fmt */
+		width  = 640;
+		height = 480;
+	} else if (dev->board.is_em2800) {
 		/* the em2800 can only scale down to 50% */
 		height = height > (3 * maxh / 4) ? maxh : maxh / 2;
 		width = width > (3 * maxw / 4) ? maxw : maxw / 2;
@@ -747,6 +760,10 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 
 	mutex_lock(&dev->lock);
 
+	/* FIXME: This is the only supported fmt */
+	if (dev->board.is_27xx)
+		f->fmt.pix.pixelformat = V4L2_PIX_FMT_RGB565;
+
 	vidioc_try_fmt_vid_cap(file, priv, f);
 
 	fmt = format_by_fourcc(f->fmt.pix.pixelformat);