summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWojciech Bieganski <wbieganski@antmicro.com>2017-01-30 15:42:36 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-04-04 13:44:47 +0200
commiteb6ceee5ed319d72bb98cdc4cda4685199e30d9a (patch)
treef4f1763beb89721e8a5751322f79296232bd4374 /drivers
parent8d9c2867df5fe6f5a54fe90b19ff2bfd325b3288 (diff)
media: three csi2 inputs: tc378743 (csia/b), adv7280m (csie)
Signed-off-by: Wojciech Bieganski <wbieganski@antmicro.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/i2c/soc_camera/adv7280.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/i2c/soc_camera/adv7280.c b/drivers/media/i2c/soc_camera/adv7280.c
index 0cafa2d9961c..d5e7391b6b75 100644
--- a/drivers/media/i2c/soc_camera/adv7280.c
+++ b/drivers/media/i2c/soc_camera/adv7280.c
@@ -1,5 +1,5 @@
/*
- * ADV7280 camera decoder driver, based on ADV7280 driver
+ * ADV7280 camera decoder driver, based on ADV7180 driver
*
* Copyright (c) 2014 Antmicro Ltd <www.antmicro.com>
* Based on ADV7180 video decoder driver,
@@ -317,7 +317,7 @@ static int adv7280_s_fmt(struct v4l2_subdev *sd,
switch (code) {
case V4L2_MBUS_FMT_UYVY8_2X8:
- cspace = V4L2_COLORSPACE_SRGB;
+ cspace = V4L2_COLORSPACE_SMPTE170M;
break;
default:
return -EINVAL;
@@ -338,10 +338,10 @@ static int adv7280_try_fmt(struct v4l2_subdev *sd,
mf->field = V4L2_FIELD_INTERLACED_TB;
#endif
mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
- mf->colorspace = V4L2_COLORSPACE_SRGB;
+ mf->colorspace = V4L2_COLORSPACE_SMPTE170M;
- // PAL
- mf->width = 640;
+ /* PAL, line aligned to 64B */
+ mf->width = 736;
mf->height = 576;
return 0;
@@ -831,3 +831,4 @@ module_exit(adv7280_exit);
MODULE_DESCRIPTION("Analog Devices ADV7280/ADV7280-M video decoder driver");
MODULE_AUTHOR("Wojciech Bieganski <wbieganski@antmicro.com>");
MODULE_LICENSE("GPL v2");
+