media: vimc: use correct subdev functions

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>

diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c
index 4d663e89d33f1f0e7b0b2a3252dee7e8fc03ed37..6e10b63ba9eca09f177873962439030f8b8ded14 100644 (file)
--- 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 e1602e0bc230157817d8762926b96682bcca923d..e583ec7a91da9572f787375103c20a0bb6f8413b 100644 (file)
--- 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 54184cd9e0ff652bb4e11d6322f1a99849aedca1..605e2a2d5dd5610389f4297a1839322b3d198584 100644 (file)
--- a/drivers/media/platform/vimc/vimc-sensor.c
+++ b/drivers/media/platform/vimc/vimc-sensor.c
@@ -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)