Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ceda32b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 3da7ee94

drivers/media/platform/vimc/vimc-debayer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -533,7 +533,7 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master, 
	/* Initialize ved and sd */

	/* Initialize ved and sd */

	ret = vimc_ent_sd_register(&vdeb->ved, &vdeb->sd, v4l2_dev,

	ret = vimc_ent_sd_register(&vdeb->ved, &vdeb->sd, v4l2_dev,

				   pdata->entity_name,

				   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,

				   (const unsigned long[2]) {MEDIA_PAD_FL_SINK,

				   MEDIA_PAD_FL_SOURCE},

				   MEDIA_PAD_FL_SOURCE},

				   &vimc_deb_ops);

				   &vimc_deb_ops);

drivers/media/platform/vimc/vimc-scaler.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -395,7 +395,7 @@ static int vimc_sca_comp_bind(struct device *comp, struct device *master, 
	/* Initialize ved and sd */

	/* Initialize ved and sd */

	ret = vimc_ent_sd_register(&vsca->ved, &vsca->sd, v4l2_dev,

	ret = vimc_ent_sd_register(&vsca->ved, &vsca->sd, v4l2_dev,

				   pdata->entity_name,

				   pdata->entity_name,

				   MEDIA_ENT_F_ATV_DECODER, 2,

				   MEDIA_ENT_F_PROC_VIDEO_SCALER, 2,

				   (const unsigned long[2]) {MEDIA_PAD_FL_SINK,

				   (const unsigned long[2]) {MEDIA_PAD_FL_SINK,

				   MEDIA_PAD_FL_SOURCE},

				   MEDIA_PAD_FL_SOURCE},

				   &vimc_sca_ops);

				   &vimc_sca_ops);

drivers/media/platform/vimc/vimc-sensor.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -386,7 +386,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, 
	/* Initialize ved and sd */

	/* Initialize ved and sd */

	ret = vimc_ent_sd_register(&vsen->ved, &vsen->sd, v4l2_dev,

	ret = vimc_ent_sd_register(&vsen->ved, &vsen->sd, v4l2_dev,

				   pdata->entity_name,

				   pdata->entity_name,

				   MEDIA_ENT_F_ATV_DECODER, 1,

				   MEDIA_ENT_F_CAM_SENSOR, 1,

				   (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE},

				   (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE},

				   &vimc_sen_ops);

				   &vimc_sen_ops);

	if (ret)

	if (ret)