Commit b5cbab5e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: imx: imx7-media-csi: Set RFF burst type in imx7_csi_configure() 



The RFF burst type is set in imx7_csi_dmareq_rff_enable(), which doesn't
match the function name. Move it to imx7_csi_configure().

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d525febd

drivers/staging/media/imx/imx7-media-csi.c

+1 −6
Original line number Diff line number Diff line
@@ -308,10 +308,6 @@ static void imx7_csi_rx_fifo_clear(struct imx7_csi *csi) 
static void imx7_csi_dmareq_rff_enable(struct imx7_csi *csi)

{

	u32 cr3 = imx7_csi_reg_read(csi, CSI_CSICR3);

	u32 cr2 = imx7_csi_reg_read(csi, CSI_CSICR2);



	/* Burst Type of DMA Transfer from RxFIFO. INCR16 */

	cr2 |= BIT_DMA_BURST_TYPE_RFF_INCR16;



	cr3 |= BIT_DMA_REQ_EN_RFF;

	cr3 |= BIT_HRESP_ERR_EN;
@@ -319,7 +315,6 @@ static void imx7_csi_dmareq_rff_enable(struct imx7_csi *csi) 
	cr3 |= BIT_RXFF_LEVEL(2);



	imx7_csi_reg_write(csi, cr3, CSI_CSICR3);

	imx7_csi_reg_write(csi, cr2, CSI_CSICR2);

}



static void imx7_csi_dmareq_rff_disable(struct imx7_csi *csi)
@@ -532,7 +527,7 @@ static void imx7_csi_configure(struct imx7_csi *csi) 
	}



	imx7_csi_reg_write(csi, cr1, CSI_CSICR1);

	imx7_csi_reg_write(csi, 0, CSI_CSICR2);

	imx7_csi_reg_write(csi, BIT_DMA_BURST_TYPE_RFF_INCR16, CSI_CSICR2);

	imx7_csi_reg_write(csi, BIT_FRMCNT_RST, CSI_CSICR3);

	imx7_csi_reg_write(csi, cr18, CSI_CSICR18);