Commit 87c6f1b5 authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files

media: rcar-csi2: Handle per-SoC number of channels 



The R-Car CSI-2 interface has a number of selectable 'channels' that
provides pixel data to the VINs during image acquisition.

Each channel can be used to match a CSI-2 data type and a CSI-2 virtual
channel to be routed to output path.

Different SoCs have different number of channels, with R-Car E3 being the
notable exception supporting only 2 of them.

Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 10c08812

drivers/media/platform/rcar-vin/rcar-csi2.c

+12 −3
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ struct rcar_csi2_info { 
	int (*confirm_start)(struct rcar_csi2 *priv);

	const struct rcsi2_mbps_reg *hsfreqrange;

	unsigned int csi0clkfreqrange;

	unsigned int num_channels;

	bool clear_ulps;

};
@@ -476,13 +477,14 @@ static int rcsi2_start(struct rcar_csi2 *priv) 
	format = rcsi2_code_to_fmt(priv->mf.code);



	/*

	 * Enable all Virtual Channels.

	 * Enable all supported CSI-2 channels with virtual channel and

	 * data type matching.

	 *

	 * NOTE: It's not possible to get individual datatype for each

	 *       source virtual channel. Once this is possible in V4L2

	 *       it should be used here.

	 */

	for (i = 0; i < 4; i++) {

	for (i = 0; i < priv->info->num_channels; i++) {

		u32 vcdt_part;



		vcdt_part = VCDT_SEL_VC(i) | VCDT_VCDTN_EN | VCDT_SEL_DTN_ON |
@@ -511,6 +513,7 @@ static int rcsi2_start(struct rcar_csi2 *priv) 
	rcsi2_write(priv, FLD_REG, FLD_FLD_NUM(2) | FLD_FLD_EN4 |

		    FLD_FLD_EN3 | FLD_FLD_EN2 | FLD_FLD_EN);

	rcsi2_write(priv, VCDT_REG, vcdt);

	if (vcdt2)

		rcsi2_write(priv, VCDT2_REG, vcdt2);

	/* Lanes are zero indexed. */

	rcsi2_write(priv, LSWAP_REG,
@@ -940,32 +943,38 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a7795 = { 
	.init_phtw = rcsi2_init_phtw_h3_v3h_m3n,

	.hsfreqrange = hsfreqrange_h3_v3h_m3n,

	.csi0clkfreqrange = 0x20,

	.num_channels = 4,

	.clear_ulps = true,

};



static const struct rcar_csi2_info rcar_csi2_info_r8a7795es1 = {

	.hsfreqrange = hsfreqrange_m3w_h3es1,

	.num_channels = 4,

};



static const struct rcar_csi2_info rcar_csi2_info_r8a7796 = {

	.hsfreqrange = hsfreqrange_m3w_h3es1,

	.num_channels = 4,

};



static const struct rcar_csi2_info rcar_csi2_info_r8a77965 = {

	.init_phtw = rcsi2_init_phtw_h3_v3h_m3n,

	.hsfreqrange = hsfreqrange_h3_v3h_m3n,

	.csi0clkfreqrange = 0x20,

	.num_channels = 4,

	.clear_ulps = true,

};



static const struct rcar_csi2_info rcar_csi2_info_r8a77970 = {

	.init_phtw = rcsi2_init_phtw_v3m_e3,

	.confirm_start = rcsi2_confirm_start_v3m_e3,

	.num_channels = 4,

};



static const struct rcar_csi2_info rcar_csi2_info_r8a77990 = {

	.init_phtw = rcsi2_init_phtw_v3m_e3,

	.confirm_start = rcsi2_confirm_start_v3m_e3,

	.num_channels = 2,

};



static const struct of_device_id rcar_csi2_of_table[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE