media: atmel: atmel-isc: create register offsets struct

Create a struct that holds register offsets that are product specific.
Add initially the CSC register.
This allows each product that contains a variant of the ISC to add their
own register offset.

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 f9190fccb4827091eedd279727e2b2eaf2107348..18136e58a7548e4d932fcb9db69eb530216d5b04 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -2326,7 +2326,7 @@ int isc_pipeline_init(struct isc_device *isc)
                REG_FIELD(ISC_GAM_CTRL, 1, 1),
                REG_FIELD(ISC_GAM_CTRL, 2, 2),
                REG_FIELD(ISC_GAM_CTRL, 3, 3),
-               REG_FIELD(ISC_CSC_CTRL, 0, 0),
+               REG_FIELD(ISC_CSC_CTRL + isc->offsets.csc, 0, 0),
                REG_FIELD(ISC_CBC_CTRL, 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 f1e160ed435121b91cf7f3859cd74ed96f5a263f..5a65600c5f8837d86156f1034de2a066cc912e67 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-regs.h
+++ b/drivers/media/platform/atmel/atmel-isc-regs.h
@@ -153,6 +153,9 @@
 /* ISC_Gamma Correction Green Entry Register */
 #define ISC_GAM_RENTRY 0x00000298
 
+/* Offset for CSC register specific to sama5d2 product */
+#define ISC_SAMA5D2_CSC_OFFSET 0
+
 /* Color Space Conversion Control Register */
 #define ISC_CSC_CTRL    0x00000398
 

diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index bb0b4419deff47c1d76b4bc22a0c3420d5a2a5dd..ef3a0451192d669442d1e44a4286494578d304d3 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -144,6 +144,14 @@ struct isc_ctrls {
 
 #define ISC_PIPE_LINE_NODE_NUM 11
 
+/*
+ * struct isc_reg_offsets - ISC device register offsets
+ * @csc:               Offset for the CSC register
+ */
+struct isc_reg_offsets {
+       u32 csc;
+};
+
 /*
  * struct isc_device - ISC device driver data/config struct
  * @regmap:            Register map
@@ -195,6 +203,8 @@ struct isc_ctrls {
  *
  * @config_csc:                pointer to a function that initializes product
  *                     specific CSC module
+ *
+ * @offsets:           struct holding the product specific register offsets
  */
 struct isc_device {
        struct regmap           *regmap;
@@ -266,6 +276,8 @@ struct isc_device {
        struct {
                void (*config_csc)(struct isc_device *isc);
        };
+
+       struct isc_reg_offsets          offsets;
 };
 
 extern struct isc_format formats_list[];

diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 9ea1cec7bdae196a9bc7ca20ea70f7817db7469b..607b9e306f9db90190e637476e8ae5de71a4ed89 100644 (file)
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -59,12 +59,18 @@ static void isc_sama5d2_config_csc(struct isc_device *isc)
        struct regmap *regmap = isc->regmap;
 
        /* Convert RGB to YUV */
-       regmap_write(regmap, ISC_CSC_YR_YG, 0x42 | (0x81 << 16));
-       regmap_write(regmap, ISC_CSC_YB_OY, 0x19 | (0x10 << 16));
-       regmap_write(regmap, ISC_CSC_CBR_CBG, 0xFDA | (0xFB6 << 16));
-       regmap_write(regmap, ISC_CSC_CBB_OCB, 0x70 | (0x80 << 16));
-       regmap_write(regmap, ISC_CSC_CRR_CRG, 0x70 | (0xFA2 << 16));
-       regmap_write(regmap, ISC_CSC_CRB_OCR, 0xFEE | (0x80 << 16));
+       regmap_write(regmap, ISC_CSC_YR_YG + isc->offsets.csc,
+                    0x42 | (0x81 << 16));
+       regmap_write(regmap, ISC_CSC_YB_OY + isc->offsets.csc,
+                    0x19 | (0x10 << 16));
+       regmap_write(regmap, ISC_CSC_CBR_CBG + isc->offsets.csc,
+                    0xFDA | (0xFB6 << 16));
+       regmap_write(regmap, ISC_CSC_CBB_OCB + isc->offsets.csc,
+                    0x70 | (0x80 << 16));
+       regmap_write(regmap, ISC_CSC_CRR_CRG + isc->offsets.csc,
+                    0x70 | (0xFA2 << 16));
+       regmap_write(regmap, ISC_CSC_CRB_OCR + isc->offsets.csc,
+                    0xFEE | (0x80 << 16));
 }
 
 /* Gamma table with gamma 1/2.2 */
@@ -213,6 +219,8 @@ static int atmel_isc_probe(struct platform_device *pdev)
 
        isc->config_csc = isc_sama5d2_config_csc;
 
+       isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;
+
        /* sama5d2-isc - 8 bits per beat */
        isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;