75 lines
2.8 KiB
Diff
75 lines
2.8 KiB
Diff
From b432a8b0fc88de5b49236482053d8d372c68ee55 Mon Sep 17 00:00:00 2001
|
|
From: Eugen Hristev <eugen.hristev@microchip.com>
|
|
Date: Tue, 13 Apr 2021 12:57:10 +0200
|
|
Subject: [PATCH 168/247] media: atmel: atmel-isc: add RLP to register offsets
|
|
|
|
The RLP submodule is a part of the atmel-isc pipeline, and stands for
|
|
Rounding,Limiting and Packaging. It used to extract specific data from the
|
|
ISC pipeline. For example if we want to output greyscale 8 bit, we would
|
|
use limiting to 8 bits, and packaging to Luma component only.
|
|
Add rlp 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 <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-regs.h | 2 ++
|
|
drivers/media/platform/atmel/atmel-isc.h | 2 ++
|
|
drivers/media/platform/atmel/atmel-sama5d2-isc.c | 1 +
|
|
4 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/media/platform/atmel/atmel-isc-base.c
|
|
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
|
|
@@ -726,8 +726,8 @@ static int isc_configure(struct isc_devi
|
|
|
|
regmap_update_bits(regmap, ISC_PFE_CFG0, mask, pfe_cfg0);
|
|
|
|
- regmap_update_bits(regmap, ISC_RLP_CFG, ISC_RLP_CFG_MODE_MASK,
|
|
- rlp_mode);
|
|
+ regmap_update_bits(regmap, ISC_RLP_CFG + isc->offsets.rlp,
|
|
+ ISC_RLP_CFG_MODE_MASK, rlp_mode);
|
|
|
|
regmap_write(regmap, ISC_DCFG, dcfg);
|
|
|
|
--- a/drivers/media/platform/atmel/atmel-isc-regs.h
|
|
+++ b/drivers/media/platform/atmel/atmel-isc-regs.h
|
|
@@ -204,6 +204,8 @@
|
|
/* Subsampling 4:2:2 to 4:2:0 Control Register */
|
|
#define ISC_SUB420_CTRL 0x000003cc
|
|
|
|
+/* Offset for RLP register specific to sama5d2 product */
|
|
+#define ISC_SAMA5D2_RLP_OFFSET 0
|
|
/* Rounding, Limiting and Packing Configuration Register */
|
|
#define ISC_RLP_CFG 0x000003d0
|
|
|
|
--- a/drivers/media/platform/atmel/atmel-isc.h
|
|
+++ b/drivers/media/platform/atmel/atmel-isc.h
|
|
@@ -149,12 +149,14 @@ struct isc_ctrls {
|
|
* @cbc: Offset for the CBC register
|
|
* @sub422: Offset for the SUB422 register
|
|
* @sub420: Offset for the SUB420 register
|
|
+ * @rlp: Offset for the RLP register
|
|
*/
|
|
struct isc_reg_offsets {
|
|
u32 csc;
|
|
u32 cbc;
|
|
u32 sub422;
|
|
u32 sub420;
|
|
+ u32 rlp;
|
|
};
|
|
|
|
/*
|
|
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
@@ -255,6 +255,7 @@ static int atmel_isc_probe(struct platfo
|
|
isc->offsets.cbc = ISC_SAMA5D2_CBC_OFFSET;
|
|
isc->offsets.sub422 = ISC_SAMA5D2_SUB422_OFFSET;
|
|
isc->offsets.sub420 = ISC_SAMA5D2_SUB420_OFFSET;
|
|
+ isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET;
|
|
|
|
/* sama5d2-isc - 8 bits per beat */
|
|
isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
|