diff options
Diffstat (limited to 'drivers/media/video/stk-sensor.c')
-rw-r--r-- | drivers/media/video/stk-sensor.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/media/video/stk-sensor.c b/drivers/media/video/stk-sensor.c index 4a9a0b62efa3..1a8692d9ee5a 100644 --- a/drivers/media/video/stk-sensor.c +++ b/drivers/media/video/stk-sensor.c | |||
@@ -380,7 +380,7 @@ int stk_sensor_init(struct stk_camera *dev) | |||
380 | STK_ERROR("Strange error reading sensor ID\n"); | 380 | STK_ERROR("Strange error reading sensor ID\n"); |
381 | return -ENODEV; | 381 | return -ENODEV; |
382 | } | 382 | } |
383 | if (idh != 0x7F || idl != 0xA2) { | 383 | if (idh != 0x7f || idl != 0xa2) { |
384 | STK_ERROR("Huh? you don't have a sensor from ovt\n"); | 384 | STK_ERROR("Huh? you don't have a sensor from ovt\n"); |
385 | return -ENODEV; | 385 | return -ENODEV; |
386 | } | 386 | } |
@@ -409,6 +409,19 @@ static struct regval ov_fmt_uyvy[] = { | |||
409 | {REG_COM15, COM15_R00FF }, | 409 | {REG_COM15, COM15_R00FF }, |
410 | {0xff, 0xff}, /* END MARKER */ | 410 | {0xff, 0xff}, /* END MARKER */ |
411 | }; | 411 | }; |
412 | /* V4L2_PIX_FMT_YUYV */ | ||
413 | static struct regval ov_fmt_yuyv[] = { | ||
414 | {REG_TSLB, 0 }, | ||
415 | { 0x4f, 0x80 }, /* "matrix coefficient 1" */ | ||
416 | { 0x50, 0x80 }, /* "matrix coefficient 2" */ | ||
417 | { 0x51, 0 }, /* vb */ | ||
418 | { 0x52, 0x22 }, /* "matrix coefficient 4" */ | ||
419 | { 0x53, 0x5e }, /* "matrix coefficient 5" */ | ||
420 | { 0x54, 0x80 }, /* "matrix coefficient 6" */ | ||
421 | {REG_COM13, COM13_UVSAT|COM13_CMATRIX}, | ||
422 | {REG_COM15, COM15_R00FF }, | ||
423 | {0xff, 0xff}, /* END MARKER */ | ||
424 | }; | ||
412 | 425 | ||
413 | /* V4L2_PIX_FMT_RGB565X rrrrrggg gggbbbbb */ | 426 | /* V4L2_PIX_FMT_RGB565X rrrrrggg gggbbbbb */ |
414 | static struct regval ov_fmt_rgbr[] = { | 427 | static struct regval ov_fmt_rgbr[] = { |
@@ -519,6 +532,10 @@ int stk_sensor_configure(struct stk_camera *dev) | |||
519 | com7 |= COM7_YUV; | 532 | com7 |= COM7_YUV; |
520 | rv = ov_fmt_uyvy; | 533 | rv = ov_fmt_uyvy; |
521 | break; | 534 | break; |
535 | case V4L2_PIX_FMT_YUYV: | ||
536 | com7 |= COM7_YUV; | ||
537 | rv = ov_fmt_yuyv; | ||
538 | break; | ||
522 | case V4L2_PIX_FMT_RGB565: | 539 | case V4L2_PIX_FMT_RGB565: |
523 | com7 |= COM7_RGB; | 540 | com7 |= COM7_RGB; |
524 | rv = ov_fmt_rgbp; | 541 | rv = ov_fmt_rgbp; |