at91: add kernel support for sama7g5 soc

[openwrt/staging/mkresin.git] / target / linux / at91 / patches-5.10 / 164-media-atmel-atmel-isc-create-register-offsets-struct.patch

diff --git a/target/linux/at91/patches-5.10/164-media-atmel-atmel-isc-create-register-offsets-struct.patch b/target/linux/at91/patches-5.10/164-media-atmel-atmel-isc-create-register-offsets-struct.patch
new file mode 100644 (file)
index 0000000..7834983
--- /dev/null
+++ b/target/linux/at91/patches-5.10/164-media-atmel-atmel-isc-create-register-offsets-struct.patch
@@ -0,0 +1,126 @@
+From 7a1b082cd81a2496e2687cee7ea1ef04a3020f48 Mon Sep 17 00:00:00 2001
+From: Eugen Hristev <eugen.hristev@microchip.com>
+Date: Tue, 13 Apr 2021 12:57:06 +0200
+Subject: [PATCH 164/247] 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>
+---
+ drivers/media/platform/atmel/atmel-isc-base.c |  2 +-
+ drivers/media/platform/atmel/atmel-isc-regs.h |  3 +++
+ drivers/media/platform/atmel/atmel-isc.h      | 12 +++++++++++
+ .../media/platform/atmel/atmel-sama5d2-isc.c  | 20 +++++++++++++------
+ 4 files changed, 30 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
+index f9190fccb482..18136e58a754 100644
+--- 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 f1e160ed4351..5a65600c5f88 100644
+--- 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 ebdb9ed791a7..db6b4d469dff 100644
+--- a/drivers/media/platform/atmel/atmel-isc.h
++++ b/drivers/media/platform/atmel/atmel-isc.h
+@@ -143,6 +143,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
+@@ -194,6 +202,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;
+@@ -265,6 +275,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 19d0f750636c..2ad6227aa2f5 100644
+--- 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 */
+@@ -234,6 +240,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;
+ 
+-- 
+2.32.0
+