V4L/DVB (10124): em28xx: expand output formats available

Add additional output formats, which will be useful for the Pinnacle PCTV
Ultimate 880e integration with the saa7136.

Thanks to Ray Lu from Empia for providing the em2860/em2880 datasheet.

Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h
index 2e876758352cffc247708755d2b08b7258696786..65dcb91bdcc2046baa7d3070224e5c71245a5f04 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-reg.h
+++ b/drivers/media/video/em28xx/em28xx-reg.h
@@ -97,6 +97,19 @@
 #define EM28XX_R26_COMPR       0x26
 #define EM28XX_R27_OUTFMT      0x27
 
+/* em28xx Output Format Register (0x27) */
+#define EM28XX_OUTFMT_RGB_8_RGRG       0x00
+#define EM28XX_OUTFMT_RGB_8_GRGR       0x01
+#define EM28XX_OUTFMT_RGB_8_GBGB       0x02
+#define EM28XX_OUTFMT_RGB_8_BGBG       0x03
+#define EM28XX_OUTFMT_RGB_16_656       0x04
+#define EM28XX_OUTFMT_RGB_8_BAYER      0x08 /* Pattern in Reg 0x10[1-0] */
+#define EM28XX_OUTFMT_YUV211           0x10
+#define EM28XX_OUTFMT_YUV422_Y0UY1V    0x14
+#define EM28XX_OUTFMT_YUV422_Y1UY0V    0x15
+#define EM28XX_OUTFMT_YUV411           0x18
+
+
 #define EM28XX_R28_XMIN        0x28
 #define EM28XX_R29_XMAX        0x29
 #define EM28XX_R2A_YMIN        0x2a

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 4a548fbd79d39528a075e97f32bee51cfd9bdf5c..53527536481e6946b1432b2b08b4590ac0620596 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -93,7 +93,7 @@ static struct em28xx_fmt format[] = {
                .name     = "16bpp YUY2, 4:2:2, packed",
                .fourcc   = V4L2_PIX_FMT_YUYV,
                .depth    = 16,
-               .reg      = 0x14,
+               .reg      = EM28XX_OUTFMT_YUV422_Y0UY1V,
        },
 };