| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293 |
- From 52e4b779ae1af3e322d0c673375dcd51315739d4 Mon Sep 17 00:00:00 2001
- From: Eugen Hristev <[email protected]>
- Date: Tue, 13 Apr 2021 12:57:08 +0200
- Subject: [PATCH 166/247] 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 <[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 | 2 ++
- drivers/media/platform/atmel/atmel-sama5d2-isc.c | 7 +++++--
- 4 files changed, 11 insertions(+), 3 deletions(-)
- diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
- index 865410e10e70..b7728914fda8 100644
- --- a/drivers/media/platform/atmel/atmel-isc-base.c
- +++ b/drivers/media/platform/atmel/atmel-isc-base.c
- @@ -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),
- };
- diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
- index 5a65600c5f88..a5e2fe01ba9f 100644
- --- a/drivers/media/platform/atmel/atmel-isc-regs.h
- +++ b/drivers/media/platform/atmel/atmel-isc-regs.h
- @@ -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
-
- diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
- index 65c3059afb8e..d8b4b1959b94 100644
- --- a/drivers/media/platform/atmel/atmel-isc.h
- +++ b/drivers/media/platform/atmel/atmel-isc.h
- @@ -146,9 +146,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;
- };
-
- /*
- diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- index 770d62b483d0..bb9362093efe 100644
- --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
- @@ -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 */
- @@ -250,6 +252,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;
- --
- 2.32.0
|
