e58cd453d5
Add kernel support for SAMA7G5 by back-porting mainline kernel patches. Among SAMA7G5 features could be remembered: - ARM Cortex-A7 - double data rate multi-port dynamic RAM controller supporting DDR2, DDR3, DDR3L, LPDDR2, LPDDR3 up to 533MHz - peripherals for audio, video processing - 1 gigabit + 1 megabit Ethernet controllers - 6 CAN controllers - trust zone support - DVFS for CPU - criptography IPs Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
90 lines
3.4 KiB
Diff
90 lines
3.4 KiB
Diff
From aa31e58d80d233385fa3b972e6b85f293e2a9093 Mon Sep 17 00:00:00 2001
|
|
From: Eugen Hristev <eugen.hristev@microchip.com>
|
|
Date: Tue, 13 Apr 2021 12:57:07 +0200
|
|
Subject: [PATCH 165/247] media: atmel: atmel-isc: extract CBC submodule config
|
|
into separate function
|
|
|
|
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.
|
|
The CBC submodule should be initialized in the product specific driver
|
|
as it's product specific. Other products can implement it differently
|
|
|
|
[hverkuil: made isc_sama5d2_config_cbc static]
|
|
|
|
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>
|
|
---
|
|
drivers/media/platform/atmel/atmel-isc-base.c | 4 +---
|
|
drivers/media/platform/atmel/atmel-isc.h | 3 +++
|
|
drivers/media/platform/atmel/atmel-sama5d2-isc.c | 9 +++++++++
|
|
3 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
|
|
index 18136e58a754..865410e10e70 100644
|
|
--- a/drivers/media/platform/atmel/atmel-isc-base.c
|
|
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
|
|
@@ -655,9 +655,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)
|
|
regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES);
|
|
|
|
isc->config_csc(isc);
|
|
-
|
|
- regmap_write(regmap, ISC_CBC_BRIGHT, ctrls->brightness);
|
|
- regmap_write(regmap, ISC_CBC_CONTRAST, ctrls->contrast);
|
|
+ isc->config_cbc(isc);
|
|
}
|
|
|
|
static int isc_update_profile(struct isc_device *isc)
|
|
diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
|
|
index db6b4d469dff..65c3059afb8e 100644
|
|
--- a/drivers/media/platform/atmel/atmel-isc.h
|
|
+++ b/drivers/media/platform/atmel/atmel-isc.h
|
|
@@ -202,6 +202,8 @@ struct isc_reg_offsets {
|
|
*
|
|
* @config_csc: pointer to a function that initializes product
|
|
* specific CSC module
|
|
+ * @config_cbc: pointer to a function that initializes product
|
|
+ * specific CBC module
|
|
*
|
|
* @offsets: struct holding the product specific register offsets
|
|
*/
|
|
@@ -274,6 +276,7 @@ struct isc_device {
|
|
|
|
struct {
|
|
void (*config_csc)(struct isc_device *isc);
|
|
+ void (*config_cbc)(struct isc_device *isc);
|
|
};
|
|
|
|
struct isc_reg_offsets offsets;
|
|
diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
index 2ad6227aa2f5..770d62b483d0 100644
|
|
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
@@ -73,6 +73,14 @@ static void isc_sama5d2_config_csc(struct isc_device *isc)
|
|
0xFEE | (0x80 << 16));
|
|
}
|
|
|
|
+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);
|
|
+}
|
|
+
|
|
/* Gamma table with gamma 1/2.2 */
|
|
static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
|
|
/* 0 --> gamma 1/1.8 */
|
|
@@ -239,6 +247,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
|
|
isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;
|
|
|
|
isc->config_csc = isc_sama5d2_config_csc;
|
|
+ isc->config_cbc = isc_sama5d2_config_cbc;
|
|
|
|
isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
|
|
|
|
--
|
|
2.32.0
|
|
|