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>

diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index b398cdfdc2c985bba21bc4365d4d4e99b49ef7d7..25c90b821067c5b97662e5a37e2ad257f480ab08 100644 (file)
--- 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_device *isc)
 
        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);
 

diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
index 04839def6ef66931ccb16e5b5e37e8880cbe8983..2205484e04fc3b2d19223a7fb024d07fd45b3f14 100644 (file)
--- 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
 

diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index fb7257872e7cc5fbb607f4aa24f9fd0020bb4134..b7d4e7fab5705fcfc6a4c7173e42798be612b17e 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -150,12 +150,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;
 };
 
 /*

diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 8211ee9bd8b99ca2f32cca058d6144c5772207ab..06257806c8ae70e118fe7a6732d8a0ff3f6bd120 100644 (file)
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -234,6 +234,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
        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;