summaryrefslogtreecommitdiff
path: root/drivers/media/platform/vivid/vivid-core.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-05-21 04:54:58 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-31 11:25:39 -0400
commit945b07b1630fd15e556137e31e9c38d01db0fb0c (patch)
tree111f886afc6511beb609f85cbf1f115961713d33 /drivers/media/platform/vivid/vivid-core.h
parent86b93b2c95f15d6b0c753b17de43db0e7e588f2d (diff)
media: vivid: add mc
Add support for the media_device to vivid. This is a prerequisite for request support. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-core.h')
-rw-r--r--drivers/media/platform/vivid/vivid-core.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h
index 477c80a4d44c..6ccd1f5c1d91 100644
--- a/drivers/media/platform/vivid/vivid-core.h
+++ b/drivers/media/platform/vivid/vivid-core.h
@@ -136,6 +136,14 @@ struct vivid_cec_work {
struct vivid_dev {
unsigned inst;
struct v4l2_device v4l2_dev;
+#ifdef CONFIG_MEDIA_CONTROLLER
+ struct media_device mdev;
+ struct media_pad vid_cap_pad;
+ struct media_pad vid_out_pad;
+ struct media_pad vbi_cap_pad;
+ struct media_pad vbi_out_pad;
+ struct media_pad sdr_cap_pad;
+#endif
struct v4l2_ctrl_handler ctrl_hdl_user_gen;
struct v4l2_ctrl_handler ctrl_hdl_user_vid;
struct v4l2_ctrl_handler ctrl_hdl_user_aud;