| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115 |
- From 7a1b082cd81a2496e2687cee7ea1ef04a3020f48 Mon Sep 17 00:00:00 2001
- From: Eugen Hristev <[email protected]>
- Date: Tue, 13 Apr 2021 12:57:06 +0200
- Subject: [PATCH 164/247] media: atmel: atmel-isc: create register offsets
- struct
- 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 <[email protected]>
- Signed-off-by: Hans Verkuil <[email protected]>
- Signed-off-by: Mauro Carvalho Chehab <[email protected]>
- ---
- drivers/media/platform/atmel/atmel-isc-base.c | 2 +-
- drivers/media/platform/atmel/atmel-isc-regs.h | 3 +++
- drivers/media/platform/atmel/atmel-isc.h | 12 +++++++++++
- .../media/platform/atmel/atmel-sama5d2-isc.c | 20 +++++++++++++------
- 4 files changed, 30 insertions(+), 7 deletions(-)
- --- a/drivers/media/platform/atmel/atmel-isc-base.c
- +++ b/drivers/media/platform/atmel/atmel-isc-base.c
- @@ -2326,7 +2326,7 @@ int isc_pipeline_init(struct isc_device
- 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),
- --- a/drivers/media/platform/atmel/atmel-isc-regs.h
- +++ b/drivers/media/platform/atmel/atmel-isc-regs.h
- @@ -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
-
- --- a/drivers/media/platform/atmel/atmel-isc.h
- +++ b/drivers/media/platform/atmel/atmel-isc.h
- @@ -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
- * @hclock: Hclock clock input (refer datasheet)
- @@ -194,6 +202,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;
- @@ -265,6 +275,8 @@ struct isc_device {
- struct {
- void (*config_csc)(struct isc_device *isc);
- };
- +
- + struct isc_reg_offsets offsets;
- };
-
- extern struct isc_format formats_list[];
- --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- @@ -59,12 +59,18 @@ static void isc_sama5d2_config_csc(struc
- 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 */
- @@ -234,6 +240,8 @@ static int atmel_isc_probe(struct platfo
-
- 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;
-
|
