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: Andrey Konovalov <andrey.konovalov@linaro.org>
Tested-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 8a247b6f55509876d731a1ad9de5a10309450877..2ffcda06706bc86d352e318adfd8ad32bc1250e5 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -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) {

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index 008afb85023bec24eefefaf5042c32269eb257c0..03ef9c5f4774df1bc853d5cf7661da19f372d8f8 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -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) {

diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index 5722e971b1848eaf68ddc650ba19c93f7cfa0ffc..db94cfd6c5081906cc6b9545a25e01123ca52031 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -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);