evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] mx3-camera: move interface activation and deactivation to clock callbacks

Browse source 
When adding and removing a client, the mx3-camera driver only activates
and deactivates its camera interface respectively, which doesn't include
any client-specific actions. Move this functionality into .clock_start()
and .clock_stop() callbacks.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski 2013-04-04 11:24:43 -03:00 • committed by Mauro Carvalho Chehab
parent ffebad7948
commit 663ccaf4cd
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/media/platform/soc_camera/mx3_camera.c
View file

@ -460,8 +460,7 @@ static int mx3_camera_init_videobuf(struct vb2_queue *q,
} }
/* First part of ipu_csi_init_interface() */ /* First part of ipu_csi_init_interface() */
static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam, static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam)
struct soc_camera_device *icd)
{ {
u32 conf; u32 conf;
long rate; long rate;
@ -505,31 +504,40 @@ static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam,
clk_prepare_enable(mx3_cam->clk); clk_prepare_enable(mx3_cam->clk);
rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk); rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk);
dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate); dev_dbg(mx3_cam->soc_host.v4l2_dev.dev, "Set SENS_CONF to %x, rate %ld\n", conf, rate);
if (rate) if (rate)
clk_set_rate(mx3_cam->clk, rate); clk_set_rate(mx3_cam->clk, rate);
} }
/* Called with .host_lock held */
static int mx3_camera_add_device(struct soc_camera_device *icd) static int mx3_camera_add_device(struct soc_camera_device *icd)
{ {
struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx3_camera_dev *mx3_cam = ici->priv;
mx3_camera_activate(mx3_cam, icd);
mx3_cam->buf_total = 0;
dev_info(icd->parent, "MX3 Camera driver attached to camera %d\n", dev_info(icd->parent, "MX3 Camera driver attached to camera %d\n",
icd->devnum); icd->devnum);
return 0; return 0;
} }
/* Called with .host_lock held */
static void mx3_camera_remove_device(struct soc_camera_device *icd) static void mx3_camera_remove_device(struct soc_camera_device *icd)
{ {
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); dev_info(icd->parent, "MX3 Camera driver detached from camera %d\n",
icd->devnum);
}
/* Called with .host_lock held */
static int mx3_camera_clock_start(struct soc_camera_host *ici)
{
struct mx3_camera_dev *mx3_cam = ici->priv;
mx3_camera_activate(mx3_cam);
mx3_cam->buf_total = 0;
return 0;
}
/* Called with .host_lock held */
static void mx3_camera_clock_stop(struct soc_camera_host *ici)
{
struct mx3_camera_dev *mx3_cam = ici->priv; struct mx3_camera_dev *mx3_cam = ici->priv;
struct idmac_channel **ichan = &mx3_cam->idmac_channel[0]; struct idmac_channel **ichan = &mx3_cam->idmac_channel[0];
@ -539,9 +547,6 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd)
} }
clk_disable_unprepare(mx3_cam->clk); clk_disable_unprepare(mx3_cam->clk);
dev_info(icd->parent, "MX3 Camera driver detached from camera %d\n",
icd->devnum);
} }
static int test_platform_param(struct mx3_camera_dev *mx3_cam, static int test_platform_param(struct mx3_camera_dev *mx3_cam,
@ -1124,6 +1129,8 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.add = mx3_camera_add_device, .add = mx3_camera_add_device,
.remove = mx3_camera_remove_device, .remove = mx3_camera_remove_device,
.clock_start = mx3_camera_clock_start,
.clock_stop = mx3_camera_clock_stop,
.set_crop = mx3_camera_set_crop, .set_crop = mx3_camera_set_crop,
.set_fmt = mx3_camera_set_fmt, .set_fmt = mx3_camera_set_fmt,
.try_fmt = mx3_camera_try_fmt, .try_fmt = mx3_camera_try_fmt,