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/s5p-tv | |
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/s5p-tv')
-rw-r--r-- | drivers/media/platform/s5p-tv/hdmi_drv.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-tv/sdo_drv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c index 37c8bd694c5f..1d1ef211e113 100644 --- a/drivers/media/platform/s5p-tv/hdmi_drv.c +++ b/drivers/media/platform/s5p-tv/hdmi_drv.c | |||
@@ -660,7 +660,7 @@ static int hdmi_g_mbus_fmt(struct v4l2_subdev *sd, | |||
660 | memset(fmt, 0, sizeof(*fmt)); | 660 | memset(fmt, 0, sizeof(*fmt)); |
661 | fmt->width = t->hact.end - t->hact.beg; | 661 | fmt->width = t->hact.end - t->hact.beg; |
662 | fmt->height = t->vact[0].end - t->vact[0].beg; | 662 | fmt->height = t->vact[0].end - t->vact[0].beg; |
663 | fmt->code = V4L2_MBUS_FMT_FIXED; /* means RGB888 */ | 663 | fmt->code = MEDIA_BUS_FMT_FIXED; /* means RGB888 */ |
664 | fmt->colorspace = V4L2_COLORSPACE_SRGB; | 664 | fmt->colorspace = V4L2_COLORSPACE_SRGB; |
665 | if (t->interlaced) { | 665 | if (t->interlaced) { |
666 | fmt->field = V4L2_FIELD_INTERLACED; | 666 | fmt->field = V4L2_FIELD_INTERLACED; |
diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c index 72cf892dd008..46f4d56aaa1b 100644 --- a/drivers/media/platform/s5p-tv/sdo_drv.c +++ b/drivers/media/platform/s5p-tv/sdo_drv.c | |||
@@ -170,7 +170,7 @@ static int sdo_g_mbus_fmt(struct v4l2_subdev *sd, | |||
170 | /* all modes are 720 pixels wide */ | 170 | /* all modes are 720 pixels wide */ |
171 | fmt->width = 720; | 171 | fmt->width = 720; |
172 | fmt->height = sdev->fmt->height; | 172 | fmt->height = sdev->fmt->height; |
173 | fmt->code = V4L2_MBUS_FMT_FIXED; | 173 | fmt->code = MEDIA_BUS_FMT_FIXED; |
174 | fmt->field = V4L2_FIELD_INTERLACED; | 174 | fmt->field = V4L2_FIELD_INTERLACED; |
175 | fmt->colorspace = V4L2_COLORSPACE_JPEG; | 175 | fmt->colorspace = V4L2_COLORSPACE_JPEG; |
176 | return 0; | 176 | return 0; |