Commit 50795910 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Mauro Carvalho Chehab
Browse files

media: camss: use proper media entity function for subdevices 



Currently for msm_csiphy, msm_csid, and msm_ispif subdevices the media
entity function field is set to MEDIA_ENT_F_IO_V4L. This is incorrect
as MEDIA_ENT_F_IO_V4L implies V4L2 video node.

Change it to MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER as this is the best
fit from the functions defined in include/uapi/linux/media.h.

Signed-off-by: default avatarAndrey Konovalov <andrey.konovalov@linaro.org>
Tested-by: default avatarRobert Foss <robert.foss@linaro.org>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 372faeb4

drivers/media/platform/qcom/camss/camss-csid.c

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ int msm_csid_register_entity(struct csid_device *csid, 
	pads[MSM_CSID_PAD_SINK].flags = MEDIA_PAD_FL_SINK;

	pads[MSM_CSID_PAD_SRC].flags = MEDIA_PAD_FL_SOURCE;



	sd->entity.function = MEDIA_ENT_F_IO_V4L;

	sd->entity.function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;

	sd->entity.ops = &csid_media_ops;

	ret = media_entity_pads_init(&sd->entity, MSM_CSID_PADS_NUM, pads);

	if (ret < 0) {

drivers/media/platform/qcom/camss/camss-csiphy.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ int msm_csiphy_register_entity(struct csiphy_device *csiphy, 
	pads[MSM_CSIPHY_PAD_SINK].flags = MEDIA_PAD_FL_SINK;

	pads[MSM_CSIPHY_PAD_SRC].flags = MEDIA_PAD_FL_SOURCE;



	sd->entity.function = MEDIA_ENT_F_IO_V4L;

	sd->entity.function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;

	sd->entity.ops = &csiphy_media_ops;

	ret = media_entity_pads_init(&sd->entity, MSM_CSIPHY_PADS_NUM, pads);

	if (ret < 0) {

drivers/media/platform/qcom/camss/camss-ispif.c

+1 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ int msm_ispif_register_entities(struct ispif_device *ispif, 
		pads[MSM_ISPIF_PAD_SINK].flags = MEDIA_PAD_FL_SINK;

		pads[MSM_ISPIF_PAD_SRC].flags = MEDIA_PAD_FL_SOURCE;



		sd->entity.function = MEDIA_ENT_F_IO_V4L;

		sd->entity.function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;

		sd->entity.ops = &ispif_media_ops;

		ret = media_entity_pads_init(&sd->entity, MSM_ISPIF_PADS_NUM,

					     pads);