From: Eugen Hristev <eugen.hristev@microchip.com>
To: <devicetree@vger.kernel.org>, <linux-media@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Eugen Hristev <eugen.hristev@microchip.com>
Subject: [PATCH 06/30] media: atmel: atmel-isc: extract CSC submodule config into separate function
Date: Thu, 1 Apr 2021 14:26:59 +0300 [thread overview]
Message-ID: <20210401112723.189107-7-eugen.hristev@microchip.com> (raw)
In-Reply-To: <20210401112723.189107-1-eugen.hristev@microchip.com>
The CSC submodule should be initialized in the product specific driver
as it's product specific. Other products can implement it differently.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/media/platform/atmel/atmel-isc-base.c | 8 +-------
drivers/media/platform/atmel/atmel-isc.h | 7 +++++++
drivers/media/platform/atmel/atmel-sama5d2-isc.c | 15 +++++++++++++++
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index ff40ee2e2759..31f63ba90c71 100644
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -646,13 +646,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)
regmap_bulk_write(regmap, ISC_GAM_GENTRY, gamma, GAMMA_ENTRIES);
regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES);
- /* 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));
+ isc->config_csc(isc);
regmap_write(regmap, ISC_CBC_BRIGHT, ctrls->brightness);
regmap_write(regmap, ISC_CBC_CONTRAST, ctrls->contrast);
diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index d14ae096fbf6..bb0b4419deff 100644
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -192,6 +192,9 @@ struct isc_ctrls {
*
* @max_width: maximum frame width, dependent on the internal RAM
* @max_height: maximum frame height, dependent on the internal RAM
+ *
+ * @config_csc: pointer to a function that initializes product
+ * specific CSC module
*/
struct isc_device {
struct regmap *regmap;
@@ -259,6 +262,10 @@ struct isc_device {
u32 max_width;
u32 max_height;
+
+ struct {
+ void (*config_csc)(struct isc_device *isc);
+ };
};
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 6d9942dcd7c1..d9f06daffdf8 100644
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -54,6 +54,19 @@
#define ISC_CLK_MAX_DIV 255
+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));
+}
+
/* Gamma table with gamma 1/2.2 */
const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
/* 0 --> gamma 1/1.8 */
@@ -198,6 +211,8 @@ static int atmel_isc_probe(struct platform_device *pdev)
isc->max_width = ISC_SAMA5D2_MAX_SUPPORT_WIDTH;
isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;
+ isc->config_csc = isc_sama5d2_config_csc;
+
/* sama5d2-isc - 8 bits per beat */
isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Eugen Hristev <eugen.hristev@microchip.com>
To: <devicetree@vger.kernel.org>, <linux-media@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Eugen Hristev <eugen.hristev@microchip.com>
Subject: [PATCH 06/30] media: atmel: atmel-isc: extract CSC submodule config into separate function
Date: Thu, 1 Apr 2021 14:26:59 +0300 [thread overview]
Message-ID: <20210401112723.189107-7-eugen.hristev@microchip.com> (raw)
In-Reply-To: <20210401112723.189107-1-eugen.hristev@microchip.com>
The CSC submodule should be initialized in the product specific driver
as it's product specific. Other products can implement it differently.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---
drivers/media/platform/atmel/atmel-isc-base.c | 8 +-------
drivers/media/platform/atmel/atmel-isc.h | 7 +++++++
drivers/media/platform/atmel/atmel-sama5d2-isc.c | 15 +++++++++++++++
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index ff40ee2e2759..31f63ba90c71 100644
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -646,13 +646,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)
regmap_bulk_write(regmap, ISC_GAM_GENTRY, gamma, GAMMA_ENTRIES);
regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES);
- /* 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));
+ isc->config_csc(isc);
regmap_write(regmap, ISC_CBC_BRIGHT, ctrls->brightness);
regmap_write(regmap, ISC_CBC_CONTRAST, ctrls->contrast);
diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index d14ae096fbf6..bb0b4419deff 100644
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -192,6 +192,9 @@ struct isc_ctrls {
*
* @max_width: maximum frame width, dependent on the internal RAM
* @max_height: maximum frame height, dependent on the internal RAM
+ *
+ * @config_csc: pointer to a function that initializes product
+ * specific CSC module
*/
struct isc_device {
struct regmap *regmap;
@@ -259,6 +262,10 @@ struct isc_device {
u32 max_width;
u32 max_height;
+
+ struct {
+ void (*config_csc)(struct isc_device *isc);
+ };
};
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 6d9942dcd7c1..d9f06daffdf8 100644
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -54,6 +54,19 @@
#define ISC_CLK_MAX_DIV 255
+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));
+}
+
/* Gamma table with gamma 1/2.2 */
const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
/* 0 --> gamma 1/1.8 */
@@ -198,6 +211,8 @@ static int atmel_isc_probe(struct platform_device *pdev)
isc->max_width = ISC_SAMA5D2_MAX_SUPPORT_WIDTH;
isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;
+ isc->config_csc = isc_sama5d2_config_csc;
+
/* sama5d2-isc - 8 bits per beat */
isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-01 18:18 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 11:26 [PATCH 00/30] media: atmel: atmel-isc: add support for xisc Eugen Hristev
2021-04-01 11:26 ` Eugen Hristev
2021-04-01 11:26 ` [PATCH 01/30] media: atmel: atmel-isc: specialize gamma table into product specific Eugen Hristev
2021-04-01 11:26 ` Eugen Hristev
2021-04-01 11:26 ` [PATCH 02/30] media: atmel: atmel-isc: specialize driver name constant Eugen Hristev
2021-04-01 11:26 ` Eugen Hristev
2021-04-01 11:26 ` [PATCH 03/30] media: atmel: atmel-isc: add checks for limiting frame sizes Eugen Hristev
2021-04-01 11:26 ` Eugen Hristev
2021-04-01 11:26 ` [PATCH 04/30] media: atmel: atmel-isc: specialize max width and max height Eugen Hristev
2021-04-01 11:26 ` Eugen Hristev
2021-04-01 11:26 ` [PATCH 05/30] media: atmel: atmel-isc: specialize dma cfg Eugen Hristev
2021-04-01 11:26 ` Eugen Hristev
2021-04-01 11:26 ` Eugen Hristev [this message]
2021-04-01 11:26 ` [PATCH 06/30] media: atmel: atmel-isc: extract CSC submodule config into separate function Eugen Hristev
2021-04-01 20:36 ` kernel test robot
2021-04-01 20:36 ` kernel test robot
2021-04-01 20:36 ` kernel test robot
2021-04-01 11:27 ` [PATCH 07/30] media: atmel: atmel-isc-base: add id to clock debug message Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 08/30] media: atmel: atmel-isc: create register offsets struct Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 09/30] media: atmel: atmel-isc: extract CBC submodule config into separate function Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 21:37 ` kernel test robot
2021-04-01 21:37 ` kernel test robot
2021-04-01 21:37 ` kernel test robot
2021-04-01 11:27 ` [PATCH 10/30] media: atmel: atmel-isc: add CBC to the reg offsets struct Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 11/30] media: atmel: atmel-isc: add SUB422 and SUB420 to register offsets Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 12/30] media: atmel: atmel-isc: add RLP " Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 13/30] media: atmel: atmel-isc: add HIS " Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 14/30] media: atmel: atmel-isc: add DMA " Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 15/30] media: atmel: atmel-isc: add support for version register Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 16/30] media: atmel: atmel-isc: add his_entry to register offsets Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 17/30] media: atmel: atmel-isc: add register description for additional modules Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 18/30] media: atmel: atmel-isc: extend pipeline with extra modules Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 19/30] media: atmel: atmel-isc: add CC initialization function Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 20/30] media: atmel: atmel-isc: create product specific v4l2 controls config Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 21/30] media: atmel: atmel-isc: create callback for DPC submodule product specific Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 22/30] media: atmel: atmel-isc: create callback for GAM " Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 23/30] media: atmel: atmel-isc: create callback for RLP " Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 24/30] media: atmel: atmel-isc: move the formats list into product specific code Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 25/30] media: atmel: atmel-isc: create an adapt pipeline callback for product specific Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 26/30] media: atmel: atmel-isc-regs: add additional fields for sama7g5 type pipeline Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 27/30] media: atmel: atmel-isc-base: add support for more formats and additional pipeline modules Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 28/30] dt-bindings: media: atmel: add microchip-xisc binding Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 29/30] media: atmel: atmel-isc-sama5d2: remove duplicate define Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 11:27 ` [PATCH 30/30] media: atmel: atmel-isc: add microchip-xisc driver Eugen Hristev
2021-04-01 11:27 ` Eugen Hristev
2021-04-01 20:36 ` kernel test robot
2021-04-01 20:36 ` kernel test robot
2021-04-01 20:36 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210401112723.189107-7-eugen.hristev@microchip.com \
--to=eugen.hristev@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.