redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MLK-24494-4: staging: media: imx8: work around to support isi + isp dual camera 

Skip v4l2 register subdev for isi, the second csi and ov5640 sensor
because currently, isp_media_server can't handle multi camera case,
if there are other /dev/v4l-subdev, isp_media_server can't handle.

Signed-off-by: Guoniu.zhou <guoniu.zhou@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Guoniu.zhou 2020-06-30 14:06:04 +08:00
parent a113fa0556
commit 07da4e8fb8
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/i2c/ov5640.c
View File

@ -3139,8 +3139,7 @@ static int ov5640_probe(struct i2c_client *client)
v4l2_i2c_subdev_init(&sensor->sd, client, &ov5640_subdev_ops);
sensor->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
V4L2_SUBDEV_FL_HAS_EVENTS;
sensor->sd.flags |= V4L2_SUBDEV_FL_HAS_EVENTS;
sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
sensor->sd.entity.ops = &ov5640_sd_media_ops;
sensor->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;

1
drivers/staging/media/imx/imx8-isi-cap.c
View File

@ -1702,7 +1702,6 @@ static int isi_cap_probe(struct platform_device *pdev)
sd = &isi_cap->sd;
v4l2_subdev_init(sd, &mxc_isi_subdev_ops);
sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
snprintf(sd->name, sizeof(sd->name), "mxc_isi.%d", isi_cap->id);
sd->entity.function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;

3
drivers/staging/media/imx/imx8-mipi-csi2-sam.c
View File

@ -1453,7 +1453,8 @@ static int mipi_csis_subdev_init(struct v4l2_subdev *mipi_sd,
mipi_sd->owner = THIS_MODULE;
snprintf(mipi_sd->name, sizeof(mipi_sd->name), "%s.%d",
CSIS_SUBDEV_NAME, state->index);
mipi_sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
if (state->index == 0)
mipi_sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
mipi_sd->entity.function = MEDIA_ENT_F_IO_V4L;
mipi_sd->dev = &pdev->dev;