@@ -148,6 +148,18 @@ static int capture_enum_frameintervals(struct file *file, void *fh,
return 0;
}
+static int capture_enum_input(struct file *file, void *priv,
+ struct v4l2_input *inp)
+{
+ if (inp->index > 0)
+ return -EINVAL;
+
+ inp->type = V4L2_INPUT_TYPE_CAMERA;
+ strlcpy(inp->name, "Camera", sizeof(inp->name));
+
+ return 0;
+}
+
static int capture_enum_fmt_vid_cap(struct file *file, void *fh,
struct v4l2_fmtdesc *f)
{
@@ -414,6 +426,7 @@ static const struct v4l2_ioctl_ops capture_ioctl_ops = {
.vidioc_enum_framesizes = capture_enum_framesizes,
.vidioc_enum_frameintervals = capture_enum_frameintervals,
+ .vidioc_enum_input = capture_enum_input,
.vidioc_enum_fmt_vid_cap = capture_enum_fmt_vid_cap,
.vidioc_g_fmt_vid_cap = capture_g_fmt_vid_cap,
Add basic handling for VIDIOC_ENUMINPUT, where the imx capture devices report they are cameras to userspace. Code like e.g. Qt5 qcamera uses this information when enumerating camera devices and this fixes it's operation on iMX6, where it previously didn't detect any cameras. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: Hans Verkuil <hans.verkuil@cisco.com> Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Steve Longerbeam <steve_longerbeam@mentor.com> To: linux-media@vger.kernel.org --- drivers/staging/media/imx/imx-media-capture.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)