mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

media: atmel: atmel-isc: create register offsets struct

Browse source 
Create a struct that holds register offsets that are product specific.
Add initially the CSC register.
This allows each product that contains a variant of the ISC to add their
own register offset.

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:06 +02:00 committed by Mauro Carvalho Chehab
parent c59744de8a
commit ffeeb01d11
4 changed files with 30 additions and 7 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

@ -2326,7 +2326,7 @@ int isc_pipeline_init(struct isc_device *isc)
REG_FIELD(ISC_GAM_CTRL, 1, 1),
REG_FIELD(ISC_GAM_CTRL, 2, 2),
REG_FIELD(ISC_GAM_CTRL, 3, 3),
REG_FIELD(ISC_CSC_CTRL, 0, 0),
REG_FIELD(ISC_CSC_CTRL + isc->offsets.csc, 0, 0),
REG_FIELD(ISC_CBC_CTRL, 0, 0),
REG_FIELD(ISC_SUB422_CTRL, 0, 0),
REG_FIELD(ISC_SUB420_CTRL, 0, 0),

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

@ -153,6 +153,9 @@
/* ISC_Gamma Correction Green Entry Register */
#define ISC_GAM_RENTRY 0x00000298
/* Offset for CSC register specific to sama5d2 product */
#define ISC_SAMA5D2_CSC_OFFSET 0
/* Color Space Conversion Control Register */
#define ISC_CSC_CTRL 0x00000398

12
drivers/media/platform/atmel/atmel-isc.h
View file

@ -144,6 +144,14 @@ struct isc_ctrls {
#define ISC_PIPE_LINE_NODE_NUM 11
/*
* struct isc_reg_offsets - ISC device register offsets
* @csc: Offset for the CSC register
*/
struct isc_reg_offsets {
u32 csc;
};
/*
* struct isc_device - ISC device driver data/config struct
* @regmap: Register map
@ -195,6 +203,8 @@ struct isc_ctrls {
*
* @config_csc: pointer to a function that initializes product
* specific CSC module
*
* @offsets: struct holding the product specific register offsets
*/
struct isc_device {
struct regmap *regmap;
@ -266,6 +276,8 @@ struct isc_device {
struct {
void (*config_csc)(struct isc_device *isc);
};
struct isc_reg_offsets offsets;
};
extern struct isc_format formats_list[];

20
drivers/media/platform/atmel/atmel-sama5d2-isc.c
View file

@ -59,12 +59,18 @@ static void isc_sama5d2_config_csc(struct isc_device *isc)
struct regmap *regmap = isc->regmap;
/* Convert RGB to YUV */
regmap_write(regmap, ISC_CSC_YR_YG, 0x42 | (0x81 << 16));
regmap_write(regmap, ISC_CSC_YB_OY, 0x19 | (0x10 << 16));
regmap_write(regmap, ISC_CSC_CBR_CBG, 0xFDA | (0xFB6 << 16));
regmap_write(regmap, ISC_CSC_CBB_OCB, 0x70 | (0x80 << 16));
regmap_write(regmap, ISC_CSC_CRR_CRG, 0x70 | (0xFA2 << 16));
regmap_write(regmap, ISC_CSC_CRB_OCR, 0xFEE | (0x80 << 16));
regmap_write(regmap, ISC_CSC_YR_YG + isc->offsets.csc,
0x42 | (0x81 << 16));
regmap_write(regmap, ISC_CSC_YB_OY + isc->offsets.csc,
0x19 | (0x10 << 16));
regmap_write(regmap, ISC_CSC_CBR_CBG + isc->offsets.csc,
0xFDA | (0xFB6 << 16));
regmap_write(regmap, ISC_CSC_CBB_OCB + isc->offsets.csc,
0x70 | (0x80 << 16));
regmap_write(regmap, ISC_CSC_CRR_CRG + isc->offsets.csc,
0x70 | (0xFA2 << 16));
regmap_write(regmap, ISC_CSC_CRB_OCR + isc->offsets.csc,
0xFEE | (0x80 << 16));
}
/* Gamma table with gamma 1/2.2 */
@ -213,6 +219,8 @@ static int atmel_isc_probe(struct platform_device *pdev)
isc->config_csc = isc_sama5d2_config_csc;
isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
/* sama5d2-isc - 8 bits per beat */
isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;