Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5dbfe46 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

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



When adding and removing a client, the omap1-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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 39b553db

drivers/media/platform/soc_camera/omap1_camera.c

+18 −9
Original line number Diff line number Diff line
@@ -893,13 +893,26 @@ static void sensor_reset(struct omap1_cam_dev *pcdev, bool reset) 
		CAM_WRITE(pcdev, GPIO, !reset);

}



static int omap1_cam_add_device(struct soc_camera_device *icd)

{

	dev_dbg(icd->parent, "OMAP1 Camera driver attached to camera %d\n",

			icd->devnum);



	return 0;

}



static void omap1_cam_remove_device(struct soc_camera_device *icd)

{

	dev_dbg(icd->parent,

		"OMAP1 Camera driver detached from camera %d\n", icd->devnum);

}



/*

 * The following two functions absolutely depend on the fact, that

 * there can be only one camera on OMAP1 camera sensor interface

 */

static int omap1_cam_add_device(struct soc_camera_device *icd)

static int omap1_cam_clock_start(struct soc_camera_host *ici)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct omap1_cam_dev *pcdev = ici->priv;

	u32 ctrlclock;
@@ -937,14 +950,11 @@ static int omap1_cam_add_device(struct soc_camera_device *icd) 


	sensor_reset(pcdev, false);



	dev_dbg(icd->parent, "OMAP1 Camera driver attached to camera %d\n",

			icd->devnum);

	return 0;

}



static void omap1_cam_remove_device(struct soc_camera_device *icd)

static void omap1_cam_clock_stop(struct soc_camera_host *ici)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct omap1_cam_dev *pcdev = ici->priv;

	u32 ctrlclock;
@@ -965,9 +975,6 @@ static void omap1_cam_remove_device(struct soc_camera_device *icd) 
	CAM_WRITE(pcdev, CTRLCLOCK, ctrlclock & ~MCLK_EN);



	clk_disable(pcdev->clk);



	dev_dbg(icd->parent,

		"OMAP1 Camera driver detached from camera %d\n", icd->devnum);

}



/* Duplicate standard formats based on host capability of byte swapping */
@@ -1525,6 +1532,8 @@ static struct soc_camera_host_ops omap1_host_ops = { 
	.owner		= THIS_MODULE,

	.add		= omap1_cam_add_device,

	.remove		= omap1_cam_remove_device,

	.clock_start	= omap1_cam_clock_start,

	.clock_stop	= omap1_cam_clock_stop,

	.get_formats	= omap1_cam_get_formats,

	.set_crop	= omap1_cam_set_crop,

	.set_fmt	= omap1_cam_set_fmt,