UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Eugen Hristev 2021-04-13 12:57:08 +02:00 committed by Mauro Carvalho Chehab
parent d3b2ee5478
commit 4fc9e8a775
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/atmel/atmel-isc-base.c
View File

@ -2325,7 +2325,7 @@ int isc_pipeline_init(struct isc_device *isc)
REG_FIELD(ISC_GAM_CTRL, 2, 2), REG_FIELD(ISC_GAM_CTRL, 2, 2),
REG_FIELD(ISC_GAM_CTRL, 3, 3), REG_FIELD(ISC_GAM_CTRL, 3, 3),
REG_FIELD(ISC_CSC_CTRL + isc->offsets.csc, 0, 0), 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_SUB422_CTRL, 0, 0),
REG_FIELD(ISC_SUB420_CTRL, 0, 0), REG_FIELD(ISC_SUB420_CTRL, 0, 0),
}; };

3
drivers/media/platform/atmel/atmel-isc-regs.h
View File

@ -177,6 +177,9 @@
/* Color Space Conversion CRB OCR Register */ /* Color Space Conversion CRB OCR Register */
#define ISC_CSC_CRB_OCR 0x000003b0 #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 */ /* Contrast And Brightness Control Register */
#define ISC_CBC_CTRL 0x000003b4 #define ISC_CBC_CTRL 0x000003b4

2
drivers/media/platform/atmel/atmel-isc.h
View File

@ -147,9 +147,11 @@ struct isc_ctrls {
/* /*
* struct isc_reg_offsets - ISC device register offsets * struct isc_reg_offsets - ISC device register offsets
* @csc: Offset for the CSC register * @csc: Offset for the CSC register
* @cbc: Offset for the CBC register
*/ */
struct isc_reg_offsets { struct isc_reg_offsets {
u32 csc; u32 csc;
u32 cbc;
}; };
/* /*

7
drivers/media/platform/atmel/atmel-sama5d2-isc.c
View File

@ -77,8 +77,10 @@ static void isc_sama5d2_config_cbc(struct isc_device *isc)
{ {
struct regmap *regmap = isc->regmap; struct regmap *regmap = isc->regmap;
regmap_write(regmap, ISC_CBC_BRIGHT, isc->ctrls.brightness); regmap_write(regmap, ISC_CBC_BRIGHT + isc->offsets.cbc,
regmap_write(regmap, ISC_CBC_CONTRAST, isc->ctrls.contrast); isc->ctrls.brightness);
regmap_write(regmap, ISC_CBC_CONTRAST + isc->offsets.cbc,
isc->ctrls.contrast);
} }
/* Gamma table with gamma 1/2.2 */ /* 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->config_cbc = isc_sama5d2_config_cbc;
isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET; isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET;
/* sama5d2-isc - 8 bits per beat */ /* sama5d2-isc - 8 bits per beat */
isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8; isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;