4 files changed, 14 insertions, 4 deletions

diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c
index 9d63c84a9876..617415c224fe 100644
--- a/drivers/media/platform/vimc/vimc-common.c
+++ b/drivers/media/platform/vimc/vimc-common.c
@@ -434,7 +434,9 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,
         v4l2_set_subdevdata(sd, ved);
 
         /* Expose this subdev to user space */
-        sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
+        sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+        if (sd->ctrl_handler)
+                sd->flags |= V4L2_SUBDEV_FL_HAS_EVENTS;
 
         /* Initialize the media entity */
         ret = media_entity_pads_init(&sd->entity, num_pads, ved->pads);
diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c
index 4d663e89d33f..6e10b63ba9ec 100644
--- a/drivers/media/platform/vimc/vimc-debayer.c
+++ b/drivers/media/platform/vimc/vimc-debayer.c
@@ -533,7 +533,7 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master,
         /* Initialize ved and sd */
         ret = vimc_ent_sd_register(&vdeb->ved, &vdeb->sd, v4l2_dev,
                                    pdata->entity_name,
-                                   MEDIA_ENT_F_ATV_DECODER, 2,
+                                   MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV, 2,
                                    (const unsigned long[2]) {MEDIA_PAD_FL_SINK,
                                    MEDIA_PAD_FL_SOURCE},
                                    &vimc_deb_ops);
diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c
index e1602e0bc230..e583ec7a91da 100644
--- a/drivers/media/platform/vimc/vimc-scaler.c
+++ b/drivers/media/platform/vimc/vimc-scaler.c
@@ -395,7 +395,7 @@ static int vimc_sca_comp_bind(struct device *comp, struct device *master,
         /* Initialize ved and sd */
         ret = vimc_ent_sd_register(&vsca->ved, &vsca->sd, v4l2_dev,
                                    pdata->entity_name,
-                                   MEDIA_ENT_F_ATV_DECODER, 2,
+                                   MEDIA_ENT_F_PROC_VIDEO_SCALER, 2,
                                    (const unsigned long[2]) {MEDIA_PAD_FL_SINK,
                                    MEDIA_PAD_FL_SOURCE},
                                    &vimc_sca_ops);
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 @@
 #include <linux/v4l2-mediabus.h>
 #include <linux/vmalloc.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-event.h>
 #include <media/v4l2-subdev.h>
 #include <media/tpg/v4l2-tpg.h>
 
@@ -284,11 +285,18 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
         return 0;
 }
 
+static struct v4l2_subdev_core_ops vimc_sen_core_ops = {
+        .log_status = v4l2_ctrl_subdev_log_status,
+        .subscribe_event = v4l2_ctrl_subdev_subscribe_event,
+        .unsubscribe_event = v4l2_event_subdev_unsubscribe,
+};
+
 static const struct v4l2_subdev_video_ops vimc_sen_video_ops = {
         .s_stream = vimc_sen_s_stream,
 };
 
 static const struct v4l2_subdev_ops vimc_sen_ops = {
+        .core = &vimc_sen_core_ops,
         .pad = &vimc_sen_pad_ops,
         .video = &vimc_sen_video_ops,
 };
@@ -378,7 +386,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master,
         /* Initialize ved and sd */
         ret = vimc_ent_sd_register(&vsen->ved, &vsen->sd, v4l2_dev,
                                    pdata->entity_name,
-                                   MEDIA_ENT_F_ATV_DECODER, 1,
+                                   MEDIA_ENT_F_CAM_SENSOR, 1,
                                    (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE},
                                    &vimc_sen_ops);
         if (ret)