Commit 40ee17d1 authored by Eugen Hristev's avatar Eugen Hristev Committed by Mauro Carvalho Chehab
Browse files

media: atmel: atmel-isc: add RLP to register offsets 



The RLP submodule is a part of the atmel-isc pipeline, and stands for
Rounding,Limiting and Packaging. It used to extract specific data from the
ISC pipeline. For example if we want to output greyscale 8 bit, we would
use limiting to 8 bits, and packaging to Luma component only.
Add rlp to the reg offsets struct.
This will allow different products to have a different reg offset for this
particular module.

Signed-off-by: default avatarEugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 87b62b6d

drivers/media/platform/atmel/atmel-isc-base.c

+2 −2
Original line number Diff line number Diff line
@@ -726,8 +726,8 @@ static int isc_configure(struct isc_device *isc) 


	regmap_update_bits(regmap, ISC_PFE_CFG0, mask, pfe_cfg0);



	regmap_update_bits(regmap, ISC_RLP_CFG, ISC_RLP_CFG_MODE_MASK,

			   rlp_mode);

	regmap_update_bits(regmap, ISC_RLP_CFG + isc->offsets.rlp,

			   ISC_RLP_CFG_MODE_MASK, rlp_mode);



	regmap_write(regmap, ISC_DCFG, dcfg);

drivers/media/platform/atmel/atmel-isc-regs.h

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ 
/* Subsampling 4:2:2 to 4:2:0 Control Register */

#define ISC_SUB420_CTRL 0x000003cc



/* Offset for RLP register specific to sama5d2 product */

#define ISC_SAMA5D2_RLP_OFFSET	0

/* Rounding, Limiting and Packing Configuration Register */

#define ISC_RLP_CFG     0x000003d0

drivers/media/platform/atmel/atmel-isc.h

+2 −0
Original line number Diff line number Diff line
@@ -150,12 +150,14 @@ struct isc_ctrls { 
 * @cbc:		Offset for the CBC register

 * @sub422:		Offset for the SUB422 register

 * @sub420:		Offset for the SUB420 register

 * @rlp:		Offset for the RLP register

 */

struct isc_reg_offsets {

	u32 csc;

	u32 cbc;

	u32 sub422;

	u32 sub420;

	u32 rlp;

};



/*

drivers/media/platform/atmel/atmel-sama5d2-isc.c

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static int atmel_isc_probe(struct platform_device *pdev) 
	isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET;

	isc->offsets.sub422 = ISC_SAMA5D2_SUB422_OFFSET;

	isc->offsets.sub420 = ISC_SAMA5D2_SUB420_OFFSET;

	isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET;



	/* sama5d2-isc - 8 bits per beat */

	isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;