Commit 1dd59274 authored by Pratyush Yadav's avatar Pratyush Yadav Committed by Hans Verkuil
Browse files

media: cadence: csi2rx: Fix stream data configuration 



Firstly, there is no VC_EN bit present in the STREAM_DATA_CFG register.
Bit 31 is part of the VL_SELECT field. Remove it completely.

Secondly, it makes little sense to enable ith virtual channel for ith
stream. Sure, there might be a use-case that demands it. But there might
also be a use case that demands all streams to use the 0th virtual
channel. Prefer this case over the former because it is less arbitrary
and also makes it very clear what the limitations of the current driver
is instead of giving a false impression that multiple virtual channels
are supported.

Signed-off-by: default avatarPratyush Yadav <p.yadav@ti.com>
Tested-by: default avatarJulien Massot <julien.massot@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarJai Luthra <j-luthra@ti.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent a64175fa

drivers/media/platform/cadence/cdns-csi2rx.c

+5 −3
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#define CSI2RX_STREAM_STATUS_RDY			BIT(31)



#define CSI2RX_STREAM_DATA_CFG_REG(n)		(CSI2RX_STREAM_BASE(n) + 0x008)

#define CSI2RX_STREAM_DATA_CFG_EN_VC_SELECT		BIT(31)

#define CSI2RX_STREAM_DATA_CFG_VC_SELECT(n)		BIT((n) + 16)



#define CSI2RX_STREAM_CFG_REG(n)		(CSI2RX_STREAM_BASE(n) + 0x00c)
@@ -271,8 +270,11 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx) 
		writel(CSI2RX_STREAM_CFG_FIFO_MODE_LARGE_BUF,

		       csi2rx->base + CSI2RX_STREAM_CFG_REG(i));



		writel(CSI2RX_STREAM_DATA_CFG_EN_VC_SELECT |

		       CSI2RX_STREAM_DATA_CFG_VC_SELECT(i),

		/*

		 * Enable one virtual channel. When multiple virtual channels

		 * are supported this will have to be changed.

		 */

		writel(CSI2RX_STREAM_DATA_CFG_VC_SELECT(0),

		       csi2rx->base + CSI2RX_STREAM_DATA_CFG_REG(i));



		writel(CSI2RX_STREAM_CTRL_START,