diff options
| author | Sylwester Nawrocki | 2011-07-26 23:08:21 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-09-06 20:17:36 +0200 |
| commit | 574e171788ce84366e77dea5ba3db2a3a9912d34 (patch) | |
| tree | 4606484996103c170bc67f891984d21fd0826dbe /drivers/media/video/s5p-fimc/fimc-core.h | |
| parent | [media] s5p-csis: Rework the system suspend/resume helpers (diff) | |
| download | kernel-qcow2-linux-574e171788ce84366e77dea5ba3db2a3a9912d34.tar.gz kernel-qcow2-linux-574e171788ce84366e77dea5ba3db2a3a9912d34.tar.xz kernel-qcow2-linux-574e171788ce84366e77dea5ba3db2a3a9912d34.zip | |
[media] s5p-fimc: Add media entity initialization
Add intialization of the media entities for video capture
and mem-to-mem video nodes. The mem-to-mem entity has no pads
whereas the capture entity has single sink pad.
Also clean up the video node naming for consistency.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-core.h')
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-core.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h index e34cf3bf2790..fc99824fe412 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.h +++ b/drivers/media/video/s5p-fimc/fimc-core.h @@ -16,6 +16,8 @@ #include <linux/types.h> #include <linux/videodev2.h> #include <linux/io.h> + +#include <media/media-entity.h> #include <media/videobuf2-core.h> #include <media/v4l2-device.h> #include <media/v4l2-mem2mem.h> @@ -298,6 +300,7 @@ struct fimc_m2m_device { * @vfd: video device node for camera capture mode * @v4l2_dev: v4l2_device struct to manage subdevs * @sd: pointer to camera sensor subdevice currently in use + * @vd_pad: fimc video capture node pad * @fmt: Media Bus format configured at selected image sensor * @pending_buf_q: the pending buffer queue head * @active_buf_q: the queue head of buffers scheduled in hardware @@ -315,6 +318,7 @@ struct fimc_vid_cap { struct video_device *vfd; struct v4l2_device v4l2_dev; struct v4l2_subdev *sd;; + struct media_pad vd_pad; struct v4l2_mbus_framefmt fmt; struct list_head pending_buf_q; struct list_head active_buf_q; |