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

Commit deb28978 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] dt3155v4l: remove bogus single-frame capture in init_board 



For some weird reason an attempt is made in init_board to capture a
single frame. No clue why, and everything works fine without that
code.

I suspect this was test code that was never removed.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 5dcabee2

drivers/staging/media/dt3155v4l/dt3155v4l.c

+7 −34
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 


#define DT3155_DEVICE_ID 0x1223



#define DT3155_BUF_SIZE (768 * 576)



#ifdef CONFIG_DT3155_STREAMING

#define DT3155_CAPTURE_METHOD V4L2_CAP_STREAMING

#else
@@ -645,16 +643,14 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = { 
static int dt3155_init_board(struct dt3155_priv *pd)

{

	struct pci_dev *pdev = pd->pdev;

	void *buf_cpu;

	dma_addr_t buf_dma;

	int i;

	u8 tmp;

	u8 tmp = 0;



	pci_set_master(pdev); /* dt3155 needs it */



	/*  resetting the adapter  */

	iowrite32(FLD_CRPT_ODD | FLD_CRPT_EVEN | FLD_DN_ODD | FLD_DN_EVEN,

							pd->regs + CSR1);

	iowrite32(ADDR_ERR_ODD | ADDR_ERR_EVEN | FLD_CRPT_ODD | FLD_CRPT_EVEN |

			FLD_DN_ODD | FLD_DN_EVEN, pd->regs + CSR1);

	mmiowb();

	msleep(20);
@@ -710,33 +706,10 @@ static int dt3155_init_board(struct dt3155_priv *pd) 
	write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);

	write_i2c_reg(pd->regs, AD_CMD, VIDEO_CNL_1 | SYNC_CNL_1 | SYNC_LVL_3);



	/* allocate memory, and initialize the DMA machine */

	buf_cpu = dma_alloc_coherent(&pdev->dev, DT3155_BUF_SIZE, &buf_dma,

								GFP_KERNEL);

	if (!buf_cpu)

		return -ENOMEM;

	iowrite32(buf_dma, pd->regs + EVEN_DMA_START);

	iowrite32(buf_dma, pd->regs + ODD_DMA_START);

	iowrite32(0, pd->regs + EVEN_DMA_STRIDE);

	iowrite32(0, pd->regs + ODD_DMA_STRIDE);



	/*  Perform a pseudo even field acquire    */

	iowrite32(FIFO_EN | SRST | CAP_CONT_ODD, pd->regs + CSR1);

	write_i2c_reg(pd->regs, CSR2, pd->csr2 | SYNC_SNTL);

	write_i2c_reg(pd->regs, CONFIG, pd->config);

	write_i2c_reg(pd->regs, EVEN_CSR, CSR_SNGL);

	write_i2c_reg(pd->regs, CSR2, pd->csr2 | BUSY_EVEN | SYNC_SNTL);

	msleep(100);

	read_i2c_reg(pd->regs, CSR2, &tmp);

	write_i2c_reg(pd->regs, EVEN_CSR, CSR_ERROR | CSR_SNGL | CSR_DONE);

	write_i2c_reg(pd->regs, ODD_CSR, CSR_ERROR | CSR_SNGL | CSR_DONE);

	write_i2c_reg(pd->regs, CSR2, pd->csr2);

	iowrite32(FIFO_EN | SRST | FLD_DN_EVEN | FLD_DN_ODD, pd->regs + CSR1);



	/*  deallocate memory  */

	dma_free_coherent(&pdev->dev, DT3155_BUF_SIZE, buf_cpu, buf_dma);

	if (tmp & BUSY_EVEN)

		return -EIO;

	/* disable all irqs, clear all irq flags */

	iowrite32(FLD_START | FLD_END_EVEN | FLD_END_ODD,

			pd->regs + INT_CSR);



	return 0;

}

drivers/staging/media/dt3155v4l/dt3155v4l.h

+3 −0
Original line number Diff line number Diff line
@@ -74,7 +74,10 @@ 
#define AD_NEG_REF   0x02



/* CSR1 bit masks */

#define RANGE_EN       0x00008000

#define CRPT_DIS       0x00004000

#define ADDR_ERR_ODD   0x00000800

#define ADDR_ERR_EVEN  0x00000400

#define FLD_CRPT_ODD   0x00000200

#define FLD_CRPT_EVEN  0x00000100

#define FIFO_EN        0x00000080