Commit 4fc9e8a7 authored by Eugen Hristev's avatar Eugen Hristev Committed by Mauro Carvalho Chehab
Browse files

media: atmel: atmel-isc: add CBC to the reg offsets struct 



The CBC submodule is a part of the atmel-isc pipeline, and stands for
Contrast Brightness Control. It is used to apply gains and offsets to the
luma (Y) and chroma (U, V) components of the YUV elements.
Add cbc 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 d3b2ee54

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

+1 −1
Original line number Diff line number Diff line
@@ -2325,7 +2325,7 @@ int isc_pipeline_init(struct isc_device *isc) 
		REG_FIELD(ISC_GAM_CTRL, 2, 2),

		REG_FIELD(ISC_GAM_CTRL, 3, 3),

		REG_FIELD(ISC_CSC_CTRL + isc->offsets.csc, 0, 0),

		REG_FIELD(ISC_CBC_CTRL, 0, 0),

		REG_FIELD(ISC_CBC_CTRL + isc->offsets.cbc, 0, 0),

		REG_FIELD(ISC_SUB422_CTRL, 0, 0),

		REG_FIELD(ISC_SUB420_CTRL, 0, 0),

	};

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

+3 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ 
/* Color Space Conversion CRB OCR Register */

#define ISC_CSC_CRB_OCR	0x000003b0



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

#define ISC_SAMA5D2_CBC_OFFSET	0



/* Contrast And Brightness Control Register */

#define ISC_CBC_CTRL    0x000003b4

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

+2 −0
Original line number Diff line number Diff line
@@ -147,9 +147,11 @@ struct isc_ctrls { 
/*

 * struct isc_reg_offsets - ISC device register offsets

 * @csc:		Offset for the CSC register

 * @cbc:		Offset for the CBC register

 */

struct isc_reg_offsets {

	u32 csc;

	u32 cbc;

};



/*

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

+5 −2
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ static void isc_sama5d2_config_cbc(struct isc_device *isc) 
{

	struct regmap *regmap = isc->regmap;



	regmap_write(regmap, ISC_CBC_BRIGHT, isc->ctrls.brightness);

	regmap_write(regmap, ISC_CBC_CONTRAST, isc->ctrls.contrast);

	regmap_write(regmap, ISC_CBC_BRIGHT + isc->offsets.cbc,

		     isc->ctrls.brightness);

	regmap_write(regmap, ISC_CBC_CONTRAST + isc->offsets.cbc,

		     isc->ctrls.contrast);

}



/* Gamma table with gamma 1/2.2 */
@@ -229,6 +231,7 @@ static int atmel_isc_probe(struct platform_device *pdev) 
	isc->config_cbc = isc_sama5d2_config_cbc;



	isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;

	isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET;



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

	isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;