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>
85 lines
3.4 KiB
Diff
85 lines
3.4 KiB
Diff
From 96936a6753a13dea5a8f66de949e6594dd82ce22 Mon Sep 17 00:00:00 2001
|
|
From: Eugen Hristev <eugen.hristev@microchip.com>
|
|
Date: Tue, 13 Apr 2021 12:57:20 +0200
|
|
Subject: [PATCH 178/247] media: atmel: atmel-isc: create callback for GAM
|
|
submodule product specific
|
|
|
|
The GAM submodule is a part of the atmel-isc pipeline, and stands for
|
|
Gamma Correction. It is used to apply the gamma curve to the incoming pixels.
|
|
Create a product specific callback for initializing the GAM submodule
|
|
of the pipeline.
|
|
For sama5d2 product, there is no special configuration at this moment,
|
|
thus this function is a noop.
|
|
|
|
[hverkuil: made isc_sama5d2_config_gam 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 | 1 +
|
|
drivers/media/platform/atmel/atmel-isc.h | 3 +++
|
|
drivers/media/platform/atmel/atmel-sama5d2-isc.c | 6 ++++++
|
|
3 files changed, 10 insertions(+)
|
|
|
|
diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
|
|
index 777a5dc19d6e..aef0d6570d39 100644
|
|
--- a/drivers/media/platform/atmel/atmel-isc-base.c
|
|
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
|
|
@@ -663,6 +663,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)
|
|
isc->config_csc(isc);
|
|
isc->config_cbc(isc);
|
|
isc->config_cc(isc);
|
|
+ isc->config_gam(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 2f093dc968cd..151997c11f56 100644
|
|
--- a/drivers/media/platform/atmel/atmel-isc.h
|
|
+++ b/drivers/media/platform/atmel/atmel-isc.h
|
|
@@ -228,6 +228,8 @@ struct isc_reg_offsets {
|
|
* specific CBC module
|
|
* @config_cc: pointer to a function that initializes product
|
|
* specific CC module
|
|
+ * @config_gam: pointer to a function that initializes product
|
|
+ * specific GAMMA module
|
|
* @config_ctrls: pointer to a functoin that initializes product
|
|
* specific v4l2 controls.
|
|
*
|
|
@@ -305,6 +307,7 @@ struct isc_device {
|
|
void (*config_csc)(struct isc_device *isc);
|
|
void (*config_cbc)(struct isc_device *isc);
|
|
void (*config_cc)(struct isc_device *isc);
|
|
+ void (*config_gam)(struct isc_device *isc);
|
|
|
|
void (*config_ctrls)(struct isc_device *isc,
|
|
const struct v4l2_ctrl_ops *ops);
|
|
diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
index 84d1bf3305f2..b99849ecb8a1 100644
|
|
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
@@ -112,6 +112,11 @@ static void isc_sama5d2_config_dpc(struct isc_device *isc)
|
|
/* This module is not present on sama5d2 pipeline */
|
|
}
|
|
|
|
+static void isc_sama5d2_config_gam(struct isc_device *isc)
|
|
+{
|
|
+ /* No specific gamma configuration */
|
|
+}
|
|
+
|
|
/* Gamma table with gamma 1/2.2 */
|
|
static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
|
|
/* 0 --> gamma 1/1.8 */
|
|
@@ -282,6 +287,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
|
|
isc->config_csc = isc_sama5d2_config_csc;
|
|
isc->config_cbc = isc_sama5d2_config_cbc;
|
|
isc->config_cc = isc_sama5d2_config_cc;
|
|
+ isc->config_gam = isc_sama5d2_config_gam;
|
|
isc->config_ctrls = isc_sama5d2_config_ctrls;
|
|
|
|
isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
|
|
--
|
|
2.32.0
|
|
|