diff options
Diffstat (limited to 'drivers/media/platform/vimc/vimc-sensor.c')
-rw-r--r-- | drivers/media/platform/vimc/vimc-sensor.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c index 457e211514c6..605e2a2d5dd5 100644 --- a/drivers/media/platform/vimc/vimc-sensor.c +++ b/drivers/media/platform/vimc/vimc-sensor.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/v4l2-mediabus.h> | 23 | #include <linux/v4l2-mediabus.h> |
24 | #include <linux/vmalloc.h> | 24 | #include <linux/vmalloc.h> |
25 | #include <media/v4l2-ctrls.h> | 25 | #include <media/v4l2-ctrls.h> |
26 | #include <media/v4l2-event.h> | ||
26 | #include <media/v4l2-subdev.h> | 27 | #include <media/v4l2-subdev.h> |
27 | #include <media/tpg/v4l2-tpg.h> | 28 | #include <media/tpg/v4l2-tpg.h> |
28 | 29 | ||
@@ -284,11 +285,18 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable) | |||
284 | return 0; | 285 | return 0; |
285 | } | 286 | } |
286 | 287 | ||
288 | static struct v4l2_subdev_core_ops vimc_sen_core_ops = { | ||
289 | .log_status = v4l2_ctrl_subdev_log_status, | ||
290 | .subscribe_event = v4l2_ctrl_subdev_subscribe_event, | ||
291 | .unsubscribe_event = v4l2_event_subdev_unsubscribe, | ||
292 | }; | ||
293 | |||
287 | static const struct v4l2_subdev_video_ops vimc_sen_video_ops = { | 294 | static const struct v4l2_subdev_video_ops vimc_sen_video_ops = { |
288 | .s_stream = vimc_sen_s_stream, | 295 | .s_stream = vimc_sen_s_stream, |
289 | }; | 296 | }; |
290 | 297 | ||
291 | static const struct v4l2_subdev_ops vimc_sen_ops = { | 298 | static const struct v4l2_subdev_ops vimc_sen_ops = { |
299 | .core = &vimc_sen_core_ops, | ||
292 | .pad = &vimc_sen_pad_ops, | 300 | .pad = &vimc_sen_pad_ops, |
293 | .video = &vimc_sen_video_ops, | 301 | .video = &vimc_sen_video_ops, |
294 | }; | 302 | }; |
@@ -378,7 +386,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, | |||
378 | /* Initialize ved and sd */ | 386 | /* Initialize ved and sd */ |
379 | ret = vimc_ent_sd_register(&vsen->ved, &vsen->sd, v4l2_dev, | 387 | ret = vimc_ent_sd_register(&vsen->ved, &vsen->sd, v4l2_dev, |
380 | pdata->entity_name, | 388 | pdata->entity_name, |
381 | MEDIA_ENT_F_ATV_DECODER, 1, | 389 | MEDIA_ENT_F_CAM_SENSOR, 1, |
382 | (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE}, | 390 | (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE}, |
383 | &vimc_sen_ops); | 391 | &vimc_sen_ops); |
384 | if (ret) | 392 | if (ret) |