Commit f5398587 authored by Dave Stevenson's avatar Dave Stevenson Committed by Mauro Carvalho Chehab
Browse files

media: i2c: imx290: Add V4L2_SUBDEV_FL_HAS_EVENTS and subscribe hooks 



Any V4L2 subdevice that implements controls and declares
V4L2_SUBDEV_FL_HAS_DEVNODE should also declare V4L2_SUBDEV_FL_HAS_EVENTS
and implement subscribe_event and unsubscribe_event hooks.

This driver didn't and would therefore fail v4l2-compliance
testing.

Add the relevant hooks.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 077d1b32

drivers/media/i2c/imx290.c

+9 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <media/media-entity.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-device.h>

#include <media/v4l2-event.h>

#include <media/v4l2-fwnode.h>

#include <media/v4l2-subdev.h>
@@ -998,6 +999,11 @@ static int imx290_entity_init_cfg(struct v4l2_subdev *subdev, 
	return 0;

}



static const struct v4l2_subdev_core_ops imx290_core_ops = {

	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,

	.unsubscribe_event = v4l2_event_subdev_unsubscribe,

};



static const struct v4l2_subdev_video_ops imx290_video_ops = {

	.s_stream = imx290_set_stream,

};
@@ -1012,6 +1018,7 @@ static const struct v4l2_subdev_pad_ops imx290_pad_ops = { 
};



static const struct v4l2_subdev_ops imx290_subdev_ops = {

	.core = &imx290_core_ops,

	.video = &imx290_video_ops,

	.pad = &imx290_pad_ops,

};
@@ -1030,7 +1037,8 @@ static int imx290_subdev_init(struct imx290 *imx290) 
	imx290->current_mode = &imx290_modes_ptr(imx290)[0];



	v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);

	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |

			    V4L2_SUBDEV_FL_HAS_EVENTS;

	imx290->sd.dev = imx290->dev;

	imx290->sd.entity.ops = &imx290_subdev_entity_ops;

	imx290->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;