diff options
author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2014-11-10 12:28:31 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-14 14:54:08 -0500 |
commit | 27ffaeb0ab160852c87e2dfa505594020e9a3a06 (patch) | |
tree | 2cd571bc21a1e3deedefc762a73a58f755fa3d03 /drivers/media/platform/davinci | |
parent | 43ba464182cd7f9e8089e3d76af8ef265ff287dd (diff) |
[media] platform: Make use of media_bus_format enum
In order to have subsytem agnostic media bus format definitions we've
moved media bus definition to include/uapi/linux/media-bus-format.h and
prefixed values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.
Reference new definitions in all platform drivers.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/davinci')
-rw-r--r-- | drivers/media/platform/davinci/vpbe.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpfe_capture.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index e5df9916b2a1..244d3d6c244c 100644 --- a/drivers/media/platform/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c | |||
@@ -227,7 +227,7 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index) | |||
227 | vpbe_current_encoder_info(vpbe_dev); | 227 | vpbe_current_encoder_info(vpbe_dev); |
228 | struct vpbe_config *cfg = vpbe_dev->cfg; | 228 | struct vpbe_config *cfg = vpbe_dev->cfg; |
229 | struct venc_platform_data *venc_device = vpbe_dev->venc_device; | 229 | struct venc_platform_data *venc_device = vpbe_dev->venc_device; |
230 | enum v4l2_mbus_pixelcode if_params; | 230 | u32 if_params; |
231 | int enc_out_index; | 231 | int enc_out_index; |
232 | int sd_index; | 232 | int sd_index; |
233 | int ret = 0; | 233 | int ret = 0; |
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index de55f47a77db..3d0e3ae1795c 100644 --- a/drivers/media/platform/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c | |||
@@ -414,13 +414,13 @@ static int vpfe_config_image_format(struct vpfe_device *vpfe_dev, | |||
414 | /* assume V4L2_PIX_FMT_UYVY as default */ | 414 | /* assume V4L2_PIX_FMT_UYVY as default */ |
415 | pix->pixelformat = V4L2_PIX_FMT_UYVY; | 415 | pix->pixelformat = V4L2_PIX_FMT_UYVY; |
416 | v4l2_fill_mbus_format(&mbus_fmt, pix, | 416 | v4l2_fill_mbus_format(&mbus_fmt, pix, |
417 | V4L2_MBUS_FMT_YUYV10_2X10); | 417 | MEDIA_BUS_FMT_YUYV10_2X10); |
418 | } else { | 418 | } else { |
419 | pix->field = V4L2_FIELD_NONE; | 419 | pix->field = V4L2_FIELD_NONE; |
420 | /* assume V4L2_PIX_FMT_SBGGR8 */ | 420 | /* assume V4L2_PIX_FMT_SBGGR8 */ |
421 | pix->pixelformat = V4L2_PIX_FMT_SBGGR8; | 421 | pix->pixelformat = V4L2_PIX_FMT_SBGGR8; |
422 | v4l2_fill_mbus_format(&mbus_fmt, pix, | 422 | v4l2_fill_mbus_format(&mbus_fmt, pix, |
423 | V4L2_MBUS_FMT_SBGGR8_1X8); | 423 | MEDIA_BUS_FMT_SBGGR8_1X8); |
424 | } | 424 | } |
425 | 425 | ||
426 | /* if sub device supports g_mbus_fmt, override the defaults */ | 426 | /* if sub device supports g_mbus_fmt, override the defaults */ |