aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/em28xx/em28xx-reg.h13
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h
index 2e876758352c..65dcb91bdcc2 100644
--- a/drivers/media/video/em28xx/em28xx-reg.h
+++ b/drivers/media/video/em28xx/em28xx-reg.h
@@ -97,6 +97,19 @@
97#define EM28XX_R26_COMPR 0x26 97#define EM28XX_R26_COMPR 0x26
98#define EM28XX_R27_OUTFMT 0x27 98#define EM28XX_R27_OUTFMT 0x27
99 99
100/* em28xx Output Format Register (0x27) */
101#define EM28XX_OUTFMT_RGB_8_RGRG 0x00
102#define EM28XX_OUTFMT_RGB_8_GRGR 0x01
103#define EM28XX_OUTFMT_RGB_8_GBGB 0x02
104#define EM28XX_OUTFMT_RGB_8_BGBG 0x03
105#define EM28XX_OUTFMT_RGB_16_656 0x04
106#define EM28XX_OUTFMT_RGB_8_BAYER 0x08 /* Pattern in Reg 0x10[1-0] */
107#define EM28XX_OUTFMT_YUV211 0x10
108#define EM28XX_OUTFMT_YUV422_Y0UY1V 0x14
109#define EM28XX_OUTFMT_YUV422_Y1UY0V 0x15
110#define EM28XX_OUTFMT_YUV411 0x18
111
112
100#define EM28XX_R28_XMIN 0x28 113#define EM28XX_R28_XMIN 0x28
101#define EM28XX_R29_XMAX 0x29 114#define EM28XX_R29_XMAX 0x29
102#define EM28XX_R2A_YMIN 0x2a 115#define EM28XX_R2A_YMIN 0x2a
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 4a548fbd79d3..53527536481e 100644
--- 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[] = {
93 .name = "16bpp YUY2, 4:2:2, packed", 93 .name = "16bpp YUY2, 4:2:2, packed",
94 .fourcc = V4L2_PIX_FMT_YUYV, 94 .fourcc = V4L2_PIX_FMT_YUYV,
95 .depth = 16, 95 .depth = 16,
96 .reg = 0x14, 96 .reg = EM28XX_OUTFMT_YUV422_Y0UY1V,
97 }, 97 },
98}; 98};
99 99