diff options
author | Erik Andr?n <erik.andren@gmail.com> | 2009-01-20 02:16:28 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:35 -0400 |
commit | 60ed6e4f4ec778b195efb92563021a376fa30524 (patch) | |
tree | afaeb1673afdf4677378a88adeb1cc8948e55313 /drivers/media | |
parent | f676bb3971b3a77c1936a8507db485af2a3f2d2a (diff) |
V4L/DVB (11544): gspca - m5602-mt9m111: Add experimental QVGA support
Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_mt9m111.c | 19 | ||||
-rw-r--r-- | drivers/media/video/gspca/m5602/m5602_mt9m111.h | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c index e7399f3d10a2..54ccc7391152 100644 --- a/drivers/media/video/gspca/m5602/m5602_mt9m111.c +++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c | |||
@@ -37,6 +37,15 @@ static int mt9m111_set_red_balance(struct gspca_dev *gspca_dev, __s32 val); | |||
37 | 37 | ||
38 | static struct v4l2_pix_format mt9m111_modes[] = { | 38 | static struct v4l2_pix_format mt9m111_modes[] = { |
39 | { | 39 | { |
40 | 320, | ||
41 | 240, | ||
42 | V4L2_PIX_FMT_SBGGR8, | ||
43 | V4L2_FIELD_NONE, | ||
44 | .sizeimage = 320 * 240, | ||
45 | .bytesperline = 320, | ||
46 | .colorspace = V4L2_COLORSPACE_SRGB, | ||
47 | .priv = 0 | ||
48 | }, { | ||
40 | 640, | 49 | 640, |
41 | 480, | 50 | 480, |
42 | V4L2_PIX_FMT_SBGGR8, | 51 | V4L2_PIX_FMT_SBGGR8, |
@@ -340,6 +349,16 @@ int mt9m111_start(struct sd *sd) | |||
340 | 349 | ||
341 | err = m5602_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2); | 350 | err = m5602_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2); |
342 | break; | 351 | break; |
352 | |||
353 | case 320: | ||
354 | PDEBUG(D_V4L2, "Configuring camera for QVGA mode"); | ||
355 | data[0] = MT9M111_RMB_OVER_SIZED; | ||
356 | data[1] = MT9M111_RMB_ROW_SKIP_4X | | ||
357 | MT9M111_RMB_COLUMN_SKIP_4X | | ||
358 | (sensor_settings[VFLIP_IDX] << 0) | | ||
359 | (sensor_settings[HFLIP_IDX] << 1); | ||
360 | err = m5602_write_sensor(sd, MT9M111_SC_R_MODE_CONTEXT_B, data, 2); | ||
361 | break; | ||
343 | } | 362 | } |
344 | return err; | 363 | return err; |
345 | } | 364 | } |
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h index 668422676aa6..716aba523a1f 100644 --- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h +++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h | |||
@@ -85,6 +85,8 @@ | |||
85 | #define MT9M111_RMB_MIRROR_COLS (1 << 1) | 85 | #define MT9M111_RMB_MIRROR_COLS (1 << 1) |
86 | #define MT9M111_RMB_ROW_SKIP_2X (1 << 2) | 86 | #define MT9M111_RMB_ROW_SKIP_2X (1 << 2) |
87 | #define MT9M111_RMB_COLUMN_SKIP_2X (1 << 3) | 87 | #define MT9M111_RMB_COLUMN_SKIP_2X (1 << 3) |
88 | #define MT9M111_RMB_ROW_SKIP_4X (1 << 4) | ||
89 | #define MT9M111_RMB_COLUMN_SKIP_4X (1 << 5) | ||
88 | 90 | ||
89 | #define MT9M111_COLOR_MATRIX_BYPASS (1 << 4) | 91 | #define MT9M111_COLOR_MATRIX_BYPASS (1 << 4) |
90 | #define MT9M111_SEL_CONTEXT_B (1 << 3) | 92 | #define MT9M111_SEL_CONTEXT_B (1 << 3) |