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

Commit 2ffd48f2 authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Philipp Zabel
Browse files

gpu: ipu-v3: Add Camera Sensor Interface unit 



Adds the Camera Sensor Interface (CSI) unit required for video capture.

Signed-off-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>

Removed the unused clk_get_rate in ipu_csi_init_interface and the
ipu_csi_ccir_err_detection_enable/disable functions.
Checkpatch cleanup.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent c2d670fd

drivers/gpu/ipu-v3/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o



imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-dc.o ipu-di.o \

imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-csi.o ipu-dc.o ipu-di.o \

		ipu-dp.o ipu-dmfc.o ipu-smfc.o

drivers/gpu/ipu-v3/ipu-common.c

+32 −12
Original line number Diff line number Diff line
@@ -217,18 +217,6 @@ int ipu_module_disable(struct ipu_soc *ipu, u32 mask) 
}

EXPORT_SYMBOL_GPL(ipu_module_disable);



int ipu_csi_enable(struct ipu_soc *ipu, int csi)

{

	return ipu_module_enable(ipu, csi ? IPU_CONF_CSI1_EN : IPU_CONF_CSI0_EN);

}

EXPORT_SYMBOL_GPL(ipu_csi_enable);



int ipu_csi_disable(struct ipu_soc *ipu, int csi)

{

	return ipu_module_disable(ipu, csi ? IPU_CONF_CSI1_EN : IPU_CONF_CSI0_EN);

}

EXPORT_SYMBOL_GPL(ipu_csi_disable);



int ipu_smfc_enable(struct ipu_soc *ipu)

{

	return ipu_module_enable(ipu, IPU_CONF_SMFC_EN);
@@ -439,6 +427,8 @@ struct ipu_devtype { 
	unsigned long cpmem_ofs;

	unsigned long srm_ofs;

	unsigned long tpm_ofs;

	unsigned long csi0_ofs;

	unsigned long csi1_ofs;

	unsigned long disp0_ofs;

	unsigned long disp1_ofs;

	unsigned long dc_tmpl_ofs;
@@ -452,6 +442,8 @@ static struct ipu_devtype ipu_type_imx51 = { 
	.cpmem_ofs = 0x1f000000,

	.srm_ofs = 0x1f040000,

	.tpm_ofs = 0x1f060000,

	.csi0_ofs = 0x1f030000,

	.csi1_ofs = 0x1f038000,

	.disp0_ofs = 0x1e040000,

	.disp1_ofs = 0x1e048000,

	.dc_tmpl_ofs = 0x1f080000,
@@ -465,6 +457,8 @@ static struct ipu_devtype ipu_type_imx53 = { 
	.cpmem_ofs = 0x07000000,

	.srm_ofs = 0x07040000,

	.tpm_ofs = 0x07060000,

	.csi0_ofs = 0x07030000,

	.csi1_ofs = 0x07038000,

	.disp0_ofs = 0x06040000,

	.disp1_ofs = 0x06048000,

	.dc_tmpl_ofs = 0x07080000,
@@ -478,6 +472,8 @@ static struct ipu_devtype ipu_type_imx6q = { 
	.cpmem_ofs = 0x00300000,

	.srm_ofs = 0x00340000,

	.tpm_ofs = 0x00360000,

	.csi0_ofs = 0x00230000,

	.csi1_ofs = 0x00238000,

	.disp0_ofs = 0x00240000,

	.disp1_ofs = 0x00248000,

	.dc_tmpl_ofs = 0x00380000,
@@ -508,6 +504,20 @@ static int ipu_submodules_init(struct ipu_soc *ipu, 
		goto err_cpmem;

	}



	ret = ipu_csi_init(ipu, dev, 0, ipu_base + devtype->csi0_ofs,

			   IPU_CONF_CSI0_EN, ipu_clk);

	if (ret) {

		unit = "csi0";

		goto err_csi_0;

	}



	ret = ipu_csi_init(ipu, dev, 1, ipu_base + devtype->csi1_ofs,

			   IPU_CONF_CSI1_EN, ipu_clk);

	if (ret) {

		unit = "csi1";

		goto err_csi_1;

	}



	ret = ipu_di_init(ipu, dev, 0, ipu_base + devtype->disp0_ofs,

			IPU_CONF_DI0_EN, ipu_clk);

	if (ret) {
@@ -562,6 +572,10 @@ static int ipu_submodules_init(struct ipu_soc *ipu, 
err_di_1:

	ipu_di_exit(ipu, 0);

err_di_0:

	ipu_csi_exit(ipu, 1);

err_csi_1:

	ipu_csi_exit(ipu, 0);

err_csi_0:

	ipu_cpmem_exit(ipu);

err_cpmem:

	dev_err(&pdev->dev, "init %s failed with %d\n", unit, ret);
@@ -640,6 +654,8 @@ static void ipu_submodules_exit(struct ipu_soc *ipu) 
	ipu_dc_exit(ipu);

	ipu_di_exit(ipu, 1);

	ipu_di_exit(ipu, 0);

	ipu_csi_exit(ipu, 1);

	ipu_csi_exit(ipu, 0);

	ipu_cpmem_exit(ipu);

}
@@ -859,6 +875,10 @@ static int ipu_probe(struct platform_device *pdev) 
			ipu_base + devtype->cm_ofs + IPU_CM_IDMAC_REG_OFS);

	dev_dbg(&pdev->dev, "cpmem:    0x%08lx\n",

			ipu_base + devtype->cpmem_ofs);

	dev_dbg(&pdev->dev, "csi0:    0x%08lx\n",

			ipu_base + devtype->csi0_ofs);

	dev_dbg(&pdev->dev, "csi1:    0x%08lx\n",

			ipu_base + devtype->csi1_ofs);

	dev_dbg(&pdev->dev, "disp0:    0x%08lx\n",

			ipu_base + devtype->disp0_ofs);

	dev_dbg(&pdev->dev, "disp1:    0x%08lx\n",

drivers/gpu/ipu-v3/ipu-csi.c

0 → 100644
+741 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/ipu-v3/ipu-prv.h

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ struct ipuv3_channel { 
};



struct ipu_cpmem;

struct ipu_csi;

struct ipu_dc_priv;

struct ipu_dmfc_priv;

struct ipu_di;
@@ -189,6 +190,7 @@ struct ipu_soc { 
	struct ipu_dp_priv	*dp_priv;

	struct ipu_dmfc_priv	*dmfc_priv;

	struct ipu_di		*di_priv[2];

	struct ipu_csi		*csi_priv[2];

	struct ipu_smfc_priv	*smfc_priv;

};
@@ -211,6 +213,10 @@ int ipu_module_disable(struct ipu_soc *ipu, u32 mask); 
bool ipu_idmac_channel_busy(struct ipu_soc *ipu, unsigned int chno);

int ipu_wait_interrupt(struct ipu_soc *ipu, int irq, int ms);



int ipu_csi_init(struct ipu_soc *ipu, struct device *dev, int id,

		 unsigned long base, u32 module, struct clk *clk_ipu);

void ipu_csi_exit(struct ipu_soc *ipu, int id);



int ipu_di_init(struct ipu_soc *ipu, struct device *dev, int id,

		unsigned long base, u32 module, struct clk *ipu_clk);

void ipu_di_exit(struct ipu_soc *ipu, int id);

include/video/imx-ipu-v3.h

+30 −2

File changed.

Preview size limit exceeded, changes collapsed.