lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] V4L: sh_mobile_ceu_camera: the host shall configure the pipeline

Browse Source 
It is a task of the host / bridge driver to bind single subdevices into a
pipeline, not of respective subdevices. Eventually this might be handled
by the Media Controller API.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski
2011-09-07 11:59:47 -03:00
committed by Mauro Carvalho Chehab
parent 7ae77ee92f
commit 489759c0ca
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/video/sh_mobile_ceu_camera.c
View File

@@ -566,16 +566,24 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
ret = sh_mobile_ceu_soft_reset(pcdev); ret = sh_mobile_ceu_soft_reset(pcdev);
csi2_sd = find_csi2(pcdev); csi2_sd = find_csi2(pcdev);
if (csi2_sd)
csi2_sd->grp_id = (long)icd;
ret = v4l2_subdev_call(csi2_sd, core, s_power, 1); ret = v4l2_subdev_call(csi2_sd, core, s_power, 1);
if (ret != -ENODEV && ret != -ENOIOCTLCMD && ret < 0) { if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV) {
pm_runtime_put_sync(ici->v4l2_dev.dev); pm_runtime_put_sync(ici->v4l2_dev.dev);
} else { return ret;
pcdev->icd = icd;
ret = 0;
} }
return ret; /*
* -ENODEV is special: either csi2_sd == NULL or the CSI-2 driver
* has not found this soc-camera device among its clients
*/
if (ret == -ENODEV && csi2_sd)
csi2_sd->grp_id = 0;
pcdev->icd = icd;
return 0;
} }
/* Called with .video_lock held */ /* Called with .video_lock held */
@@ -588,6 +596,8 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
BUG_ON(icd != pcdev->icd); BUG_ON(icd != pcdev->icd);
v4l2_subdev_call(csi2_sd, core, s_power, 0); v4l2_subdev_call(csi2_sd, core, s_power, 0);
if (csi2_sd)
csi2_sd->grp_id = 0;
/* disable capture, disable interrupts */ /* disable capture, disable interrupts */
ceu_write(pcdev, CEIER, 0); ceu_write(pcdev, CEIER, 0);
sh_mobile_ceu_soft_reset(pcdev); sh_mobile_ceu_soft_reset(pcdev);