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/sh_vou.c | |
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/sh_vou.c')
-rw-r--r-- | drivers/media/platform/sh_vou.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index e5f1d4c14f2c..047669609458 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c | |||
@@ -680,7 +680,7 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv, | |||
680 | struct sh_vou_geometry geo; | 680 | struct sh_vou_geometry geo; |
681 | struct v4l2_mbus_framefmt mbfmt = { | 681 | struct v4l2_mbus_framefmt mbfmt = { |
682 | /* Revisit: is this the correct code? */ | 682 | /* Revisit: is this the correct code? */ |
683 | .code = V4L2_MBUS_FMT_YUYV8_2X8, | 683 | .code = MEDIA_BUS_FMT_YUYV8_2X8, |
684 | .field = V4L2_FIELD_INTERLACED, | 684 | .field = V4L2_FIELD_INTERLACED, |
685 | .colorspace = V4L2_COLORSPACE_SMPTE170M, | 685 | .colorspace = V4L2_COLORSPACE_SMPTE170M, |
686 | }; | 686 | }; |
@@ -733,7 +733,7 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv, | |||
733 | /* Sanity checks */ | 733 | /* Sanity checks */ |
734 | if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH || | 734 | if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH || |
735 | (unsigned)mbfmt.height > img_height_max || | 735 | (unsigned)mbfmt.height > img_height_max || |
736 | mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8) | 736 | mbfmt.code != MEDIA_BUS_FMT_YUYV8_2X8) |
737 | return -EIO; | 737 | return -EIO; |
738 | 738 | ||
739 | if (mbfmt.width != geo.output.width || | 739 | if (mbfmt.width != geo.output.width || |
@@ -943,7 +943,7 @@ static int sh_vou_s_crop(struct file *file, void *fh, const struct v4l2_crop *a) | |||
943 | struct sh_vou_geometry geo; | 943 | struct sh_vou_geometry geo; |
944 | struct v4l2_mbus_framefmt mbfmt = { | 944 | struct v4l2_mbus_framefmt mbfmt = { |
945 | /* Revisit: is this the correct code? */ | 945 | /* Revisit: is this the correct code? */ |
946 | .code = V4L2_MBUS_FMT_YUYV8_2X8, | 946 | .code = MEDIA_BUS_FMT_YUYV8_2X8, |
947 | .field = V4L2_FIELD_INTERLACED, | 947 | .field = V4L2_FIELD_INTERLACED, |
948 | .colorspace = V4L2_COLORSPACE_SMPTE170M, | 948 | .colorspace = V4L2_COLORSPACE_SMPTE170M, |
949 | }; | 949 | }; |
@@ -994,7 +994,7 @@ static int sh_vou_s_crop(struct file *file, void *fh, const struct v4l2_crop *a) | |||
994 | /* Sanity checks */ | 994 | /* Sanity checks */ |
995 | if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH || | 995 | if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH || |
996 | (unsigned)mbfmt.height > img_height_max || | 996 | (unsigned)mbfmt.height > img_height_max || |
997 | mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8) | 997 | mbfmt.code != MEDIA_BUS_FMT_YUYV8_2X8) |
998 | return -EIO; | 998 | return -EIO; |
999 | 999 | ||
1000 | geo.output.width = mbfmt.width; | 1000 | geo.output.width = mbfmt.width; |