media: vimc: use correct subdev functions
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 7 Feb 2018 17:06:30 +0000 (12:06 -0500)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 26 Feb 2018 14:31:41 +0000 (09:31 -0500)
Instead of calling everything a MEDIA_ENT_F_ATV_DECODER, pick the
correct functions for these blocks.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/vimc/vimc-debayer.c
drivers/media/platform/vimc/vimc-scaler.c
drivers/media/platform/vimc/vimc-sensor.c

index 4d663e8..6e10b63 100644 (file)
@@ -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);
index e1602e0..e583ec7 100644 (file)
@@ -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);
index 54184cd..605e2a2 100644 (file)
@@ -386,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)