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

media: imx: imx7-media-csi: Clear BIT_MIPI_DOUBLE_CMPNT for <16b formats 



Commit 9babbbaa ("media: imx: imx7-media-csi: Use dual sampling for
YUV 1X16") set BIT_MIPI_DOUBLE_CMPNT in the CR18 register for 16-bit YUV
formats in imx7_csi_configure(). The CR18 register is always updated
with read-modify-write cycles, so if a 16-bit YUV format is selected,
the bit will stay set forever, even if the format is changed. Fix it by
clearing the bit at the beginning of the imx7_csi_configure() function.

While at it, swap two of the bits being cleared to match the MSB to LSB
order. This doesn't cause any functional change.

Fixes: 9babbbaa ("media: imx: imx7-media-csi: Use dual sampling for YUV 1X16")
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarPaul Elder <paul.elder@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent fa282e11

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

+3 −3
Original line number Diff line number Diff line
@@ -521,9 +521,9 @@ static void imx7_csi_configure(struct imx7_csi *csi) 
	cr18 = imx7_csi_reg_read(csi, CSI_CSICR18);



	cr18 &= ~(BIT_CSI_HW_ENABLE | BIT_MIPI_DATA_FORMAT_MASK |

		  BIT_DATA_FROM_MIPI | BIT_BASEADDR_CHG_ERR_EN |

		  BIT_BASEADDR_SWITCH_EN | BIT_BASEADDR_SWITCH_SEL |

		  BIT_DEINTERLACE_EN);

		  BIT_DATA_FROM_MIPI | BIT_MIPI_DOUBLE_CMPNT |

		  BIT_BASEADDR_CHG_ERR_EN | BIT_BASEADDR_SWITCH_SEL |

		  BIT_BASEADDR_SWITCH_EN | BIT_DEINTERLACE_EN);



	if (out_pix->field == V4L2_FIELD_INTERLACED) {

		cr18 |= BIT_DEINTERLACE_EN;