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

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

[media] soc-camera: move common code to soc_camera.c 



All soc-camera host drivers include a pointer to an soc-camera device in
their host private struct to check, that only one client is connected.
Move this common code to soc_camera.c.

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 b9d4b2da

drivers/media/platform/soc_camera/atmel-isi.c

+1 −9
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct atmel_isi { 
	struct list_head		video_buffer_list;

	struct frame_buffer		*active;



	struct soc_camera_device	*icd;

	struct soc_camera_host		soc_host;

};
@@ -367,7 +366,7 @@ static void start_dma(struct atmel_isi *isi, struct frame_buffer *buffer) 


	/* Check if already in a frame */

	if (isi_readl(isi, ISI_STATUS) & ISI_CTRL_CDC) {

		dev_err(isi->icd->parent, "Already in frame handling.\n");

		dev_err(isi->soc_host.icd->parent, "Already in frame handling.\n");

		return;

	}
@@ -753,9 +752,6 @@ static int isi_camera_add_device(struct soc_camera_device *icd) 
	struct atmel_isi *isi = ici->priv;

	int ret;



	if (isi->icd)

		return -EBUSY;



	ret = clk_enable(isi->pclk);

	if (ret)

		return ret;
@@ -766,7 +762,6 @@ static int isi_camera_add_device(struct soc_camera_device *icd) 
		return ret;

	}



	isi->icd = icd;

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

		 icd->devnum);

	return 0;
@@ -777,11 +772,8 @@ static void isi_camera_remove_device(struct soc_camera_device *icd) 
	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct atmel_isi *isi = ici->priv;



	BUG_ON(icd != isi->icd);



	clk_disable(isi->mck);

	clk_disable(isi->pclk);

	isi->icd = NULL;



	dev_dbg(icd->parent, "Atmel ISI Camera driver detached from camera %d\n",

		 icd->devnum);

drivers/media/platform/soc_camera/mx1_camera.c

+5 −15
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ struct mx1_buffer { 
 */

struct mx1_camera_dev {

	struct soc_camera_host		soc_host;

	struct soc_camera_device	*icd;

	struct mx1_camera_pdata		*pdata;

	struct mx1_buffer		*active;

	struct resource			*res;
@@ -220,7 +219,7 @@ static int mx1_videobuf_prepare(struct videobuf_queue *vq, 
static int mx1_camera_setup_dma(struct mx1_camera_dev *pcdev)

{

	struct videobuf_buffer *vbuf = &pcdev->active->vb;

	struct device *dev = pcdev->icd->parent;

	struct device *dev = pcdev->soc_host.icd->parent;

	int ret;



	if (unlikely(!pcdev->active)) {
@@ -331,7 +330,7 @@ static void mx1_camera_wakeup(struct mx1_camera_dev *pcdev, 
static void mx1_camera_dma_irq(int channel, void *data)

{

	struct mx1_camera_dev *pcdev = data;

	struct device *dev = pcdev->icd->parent;

	struct device *dev = pcdev->soc_host.icd->parent;

	struct mx1_buffer *buf;

	struct videobuf_buffer *vb;

	unsigned long flags;
@@ -389,7 +388,7 @@ static int mclk_get_divisor(struct mx1_camera_dev *pcdev) 
	 */

	div = (lcdclk + 2 * mclk - 1) / (2 * mclk) - 1;



	dev_dbg(pcdev->icd->parent,

	dev_dbg(pcdev->soc_host.icd->parent,

		"System clock %lukHz, target freq %dkHz, divisor %lu\n",

		lcdclk / 1000, mclk / 1000, div);
@@ -400,7 +399,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev) 
{

	unsigned int csicr1 = CSICR1_EN;



	dev_dbg(pcdev->icd->parent, "Activate device\n");

	dev_dbg(pcdev->soc_host.icd->parent, "Activate device\n");



	clk_prepare_enable(pcdev->clk);
@@ -416,7 +415,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev) 


static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)

{

	dev_dbg(pcdev->icd->parent, "Deactivate device\n");

	dev_dbg(pcdev->soc_host.icd->parent, "Deactivate device\n");



	/* Disable all CSI interface */

	__raw_writel(0x00, pcdev->base + CSICR1);
@@ -433,16 +432,11 @@ static int mx1_camera_add_device(struct soc_camera_device *icd) 
	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct mx1_camera_dev *pcdev = ici->priv;



	if (pcdev->icd)

		return -EBUSY;



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

		 icd->devnum);



	mx1_camera_activate(pcdev);



	pcdev->icd = icd;



	return 0;

}
@@ -452,8 +446,6 @@ static void mx1_camera_remove_device(struct soc_camera_device *icd) 
	struct mx1_camera_dev *pcdev = ici->priv;

	unsigned int csicr1;



	BUG_ON(icd != pcdev->icd);



	/* disable interrupts */

	csicr1 = __raw_readl(pcdev->base + CSICR1) & ~CSI_IRQ_MASK;

	__raw_writel(csicr1, pcdev->base + CSICR1);
@@ -465,8 +457,6 @@ static void mx1_camera_remove_device(struct soc_camera_device *icd) 
		 icd->devnum);



	mx1_camera_deactivate(pcdev);



	pcdev->icd = NULL;

}



static int mx1_camera_set_bus_param(struct soc_camera_device *icd)

drivers/media/platform/soc_camera/mx2_camera.c

+2 −11
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ enum mx2_camera_type { 
struct mx2_camera_dev {

	struct device		*dev;

	struct soc_camera_host	soc_host;

	struct soc_camera_device *icd;

	struct clk		*clk_emma_ahb, *clk_emma_ipg;

	struct clk		*clk_csi_ahb, *clk_csi_per;
@@ -394,8 +393,8 @@ static void mx27_update_emma_buf(struct mx2_camera_dev *pcdev, 
		writel(phys, pcdev->base_emma +

			PRP_DEST_Y_PTR - 0x14 * bufnum);

		if (prp->out_fmt == V4L2_PIX_FMT_YUV420) {

			u32 imgsize = pcdev->icd->user_height *

					pcdev->icd->user_width;

			u32 imgsize = pcdev->soc_host.icd->user_height *

					pcdev->soc_host.icd->user_width;



			writel(phys + imgsize, pcdev->base_emma +

				PRP_DEST_CB_PTR - 0x14 * bufnum);
@@ -424,9 +423,6 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) 
	int ret;

	u32 csicr1;



	if (pcdev->icd)

		return -EBUSY;



	ret = clk_prepare_enable(pcdev->clk_csi_ahb);

	if (ret < 0)

		return ret;
@@ -441,7 +437,6 @@ static int mx2_camera_add_device(struct soc_camera_device *icd) 
	pcdev->csicr1 = csicr1;

	writel(pcdev->csicr1, pcdev->base_csi + CSICR1);



	pcdev->icd = icd;

	pcdev->frame_count = 0;



	dev_info(icd->parent, "Camera driver attached to camera %d\n",
@@ -460,14 +455,10 @@ static void mx2_camera_remove_device(struct soc_camera_device *icd) 
	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct mx2_camera_dev *pcdev = ici->priv;



	BUG_ON(icd != pcdev->icd);



	dev_info(icd->parent, "Camera driver detached from camera %d\n",

		 icd->devnum);



	mx2_camera_deactivate(pcdev);



	pcdev->icd = NULL;

}



/*

drivers/media/platform/soc_camera/mx3_camera.c

+0 −9
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ struct mx3_camera_dev { 
	 * Interface. If anyone ever builds hardware to enable more than one

	 * camera _simultaneously_, they will have to modify this driver too

	 */

	struct soc_camera_device *icd;

	struct clk		*clk;



	void __iomem		*base;
@@ -517,13 +516,9 @@ 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;



	if (mx3_cam->icd)

		return -EBUSY;



	mx3_camera_activate(mx3_cam, icd);



	mx3_cam->buf_total = 0;

	mx3_cam->icd = icd;



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

		 icd->devnum);
@@ -538,8 +533,6 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd) 
	struct mx3_camera_dev *mx3_cam = ici->priv;

	struct idmac_channel **ichan = &mx3_cam->idmac_channel[0];



	BUG_ON(icd != mx3_cam->icd);



	if (*ichan) {

		dma_release_channel(&(*ichan)->dma_chan);

		*ichan = NULL;
@@ -547,8 +540,6 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd) 


	clk_disable_unprepare(mx3_cam->clk);



	mx3_cam->icd = NULL;



	dev_info(icd->parent, "MX3 Camera driver detached from camera %d\n",

		 icd->devnum);

}

drivers/media/platform/soc_camera/omap1_camera.c

+2 −12
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ struct omap1_cam_buf { 


struct omap1_cam_dev {

	struct soc_camera_host		soc_host;

	struct soc_camera_device	*icd;

	struct clk			*clk;



	unsigned int			irq;
@@ -564,7 +563,7 @@ static void videobuf_done(struct omap1_cam_dev *pcdev, 
{

	struct omap1_cam_buf *buf = pcdev->active;

	struct videobuf_buffer *vb;

	struct device *dev = pcdev->icd->parent;

	struct device *dev = pcdev->soc_host.icd->parent;



	if (WARN_ON(!buf)) {

		suspend_capture(pcdev);
@@ -790,7 +789,7 @@ static void dma_isr(int channel, unsigned short status, void *data) 
static irqreturn_t cam_isr(int irq, void *data)

{

	struct omap1_cam_dev *pcdev = data;

	struct device *dev = pcdev->icd->parent;

	struct device *dev = pcdev->soc_host.icd->parent;

	struct omap1_cam_buf *buf = pcdev->active;

	u32 it_status;

	unsigned long flags;
@@ -904,9 +903,6 @@ static int omap1_cam_add_device(struct soc_camera_device *icd) 
	struct omap1_cam_dev *pcdev = ici->priv;

	u32 ctrlclock;



	if (pcdev->icd)

		return -EBUSY;



	clk_enable(pcdev->clk);



	/* setup sensor clock */
@@ -941,8 +937,6 @@ static int omap1_cam_add_device(struct soc_camera_device *icd) 


	sensor_reset(pcdev, false);



	pcdev->icd = icd;



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

			icd->devnum);

	return 0;
@@ -954,8 +948,6 @@ static void omap1_cam_remove_device(struct soc_camera_device *icd) 
	struct omap1_cam_dev *pcdev = ici->priv;

	u32 ctrlclock;



	BUG_ON(icd != pcdev->icd);



	suspend_capture(pcdev);

	disable_capture(pcdev);
@@ -974,8 +966,6 @@ static void omap1_cam_remove_device(struct soc_camera_device *icd) 


	clk_disable(pcdev->clk);



	pcdev->icd = NULL;



	dev_dbg(icd->parent,

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

}