From: Eugen Hristev <eugen.hristev@microchip.com>
To: <devicetree@vger.kernel.org>, <linux-media@vger.kernel.org>,
<jacopo@jmondi.org>, <robh+dt@kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Eugen Hristev <eugen.hristev@microchip.com>
Subject: [PATCH v3 14/33] media: atmel: atmel-isc: add DMA to register offsets
Date: Tue, 13 Apr 2021 13:57:12 +0300 [thread overview]
Message-ID: <20210413105731.610028-15-eugen.hristev@microchip.com> (raw)
In-Reply-To: <20210413105731.610028-1-eugen.hristev@microchip.com>
The DMA submodule is a part of the atmel-isc pipeline, and stands for
Direct Memory Access. It acts like a master on the AXI bus of the SoC, and
can directly write the RAM area with the pixel data from the ISC internal
sram.
Add dma 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>
---
Changes in v3:
- added module explanation in commit message
drivers/media/platform/atmel/atmel-isc-base.c | 19 ++++++++++++-------
drivers/media/platform/atmel/atmel-isc-regs.h | 3 +++
drivers/media/platform/atmel/atmel-isc.h | 2 ++
.../media/platform/atmel/atmel-sama5d2-isc.c | 1 +
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index aa7a9a7ca0e6..11121943d2cb 100644
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -593,16 +593,20 @@ static void isc_start_dma(struct isc_device *isc)
ISC_PFE_CFG0_COLEN | ISC_PFE_CFG0_ROWEN);
addr0 = vb2_dma_contig_plane_dma_addr(&isc->cur_frm->vb.vb2_buf, 0);
- regmap_write(regmap, ISC_DAD0, addr0);
+ regmap_write(regmap, ISC_DAD0 + isc->offsets.dma, addr0);
switch (isc->config.fourcc) {
case V4L2_PIX_FMT_YUV420:
- regmap_write(regmap, ISC_DAD1, addr0 + (sizeimage * 2) / 3);
- regmap_write(regmap, ISC_DAD2, addr0 + (sizeimage * 5) / 6);
+ regmap_write(regmap, ISC_DAD1 + isc->offsets.dma,
+ addr0 + (sizeimage * 2) / 3);
+ regmap_write(regmap, ISC_DAD2 + isc->offsets.dma,
+ addr0 + (sizeimage * 5) / 6);
break;
case V4L2_PIX_FMT_YUV422P:
- regmap_write(regmap, ISC_DAD1, addr0 + sizeimage / 2);
- regmap_write(regmap, ISC_DAD2, addr0 + (sizeimage * 3) / 4);
+ regmap_write(regmap, ISC_DAD1 + isc->offsets.dma,
+ addr0 + sizeimage / 2);
+ regmap_write(regmap, ISC_DAD2 + isc->offsets.dma,
+ addr0 + (sizeimage * 3) / 4);
break;
default:
break;
@@ -610,7 +614,8 @@ static void isc_start_dma(struct isc_device *isc)
dctrl_dview = isc->config.dctrl_dview;
- regmap_write(regmap, ISC_DCTRL, dctrl_dview | ISC_DCTRL_IE_IS);
+ regmap_write(regmap, ISC_DCTRL + isc->offsets.dma,
+ dctrl_dview | ISC_DCTRL_IE_IS);
spin_lock(&isc->awb_lock);
regmap_write(regmap, ISC_CTRLEN, ISC_CTRL_CAPTURE);
spin_unlock(&isc->awb_lock);
@@ -723,7 +728,7 @@ static int isc_configure(struct isc_device *isc)
regmap_update_bits(regmap, ISC_RLP_CFG + isc->offsets.rlp,
ISC_RLP_CFG_MODE_MASK, rlp_mode);
- regmap_write(regmap, ISC_DCFG, dcfg);
+ regmap_write(regmap, ISC_DCFG + isc->offsets.dma, dcfg);
/* Set the pipeline */
isc_set_pipeline(isc, pipeline);
diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
index 0ab280ab59ec..4940998c82a2 100644
--- a/drivers/media/platform/atmel/atmel-isc-regs.h
+++ b/drivers/media/platform/atmel/atmel-isc-regs.h
@@ -247,6 +247,9 @@
#define ISC_HIS_CFG_RAR BIT(8)
+/* Offset for DMA register specific to sama5d2 product */
+#define ISC_SAMA5D2_DMA_OFFSET 0
+
/* DMA Configuration Register */
#define ISC_DCFG 0x000003e0
#define ISC_DCFG_IMODE_PACKED8 0x0
diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index 652285dc9f52..52a9199d65ee 100644
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -152,6 +152,7 @@ struct isc_ctrls {
* @sub420: Offset for the SUB420 register
* @rlp: Offset for the RLP register
* @his: Offset for the HIS related registers
+ * @dma: Offset for the DMA related registers
*/
struct isc_reg_offsets {
u32 csc;
@@ -160,6 +161,7 @@ struct isc_reg_offsets {
u32 sub420;
u32 rlp;
u32 his;
+ u32 dma;
};
/*
diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 914de4ed63f3..12f56a71db40 100644
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -239,6 +239,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
isc->offsets.sub420 = ISC_SAMA5D2_SUB420_OFFSET;
isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET;
isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET;
+ isc->offsets.dma = ISC_SAMA5D2_DMA_OFFSET;
/* 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>,
<jacopo@jmondi.org>, <robh+dt@kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Eugen Hristev <eugen.hristev@microchip.com>
Subject: [PATCH v3 14/33] media: atmel: atmel-isc: add DMA to register offsets
Date: Tue, 13 Apr 2021 13:57:12 +0300 [thread overview]
Message-ID: <20210413105731.610028-15-eugen.hristev@microchip.com> (raw)
In-Reply-To: <20210413105731.610028-1-eugen.hristev@microchip.com>
The DMA submodule is a part of the atmel-isc pipeline, and stands for
Direct Memory Access. It acts like a master on the AXI bus of the SoC, and
can directly write the RAM area with the pixel data from the ISC internal
sram.
Add dma 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>
---
Changes in v3:
- added module explanation in commit message
drivers/media/platform/atmel/atmel-isc-base.c | 19 ++++++++++++-------
drivers/media/platform/atmel/atmel-isc-regs.h | 3 +++
drivers/media/platform/atmel/atmel-isc.h | 2 ++
.../media/platform/atmel/atmel-sama5d2-isc.c | 1 +
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index aa7a9a7ca0e6..11121943d2cb 100644
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -593,16 +593,20 @@ static void isc_start_dma(struct isc_device *isc)
ISC_PFE_CFG0_COLEN | ISC_PFE_CFG0_ROWEN);
addr0 = vb2_dma_contig_plane_dma_addr(&isc->cur_frm->vb.vb2_buf, 0);
- regmap_write(regmap, ISC_DAD0, addr0);
+ regmap_write(regmap, ISC_DAD0 + isc->offsets.dma, addr0);
switch (isc->config.fourcc) {
case V4L2_PIX_FMT_YUV420:
- regmap_write(regmap, ISC_DAD1, addr0 + (sizeimage * 2) / 3);
- regmap_write(regmap, ISC_DAD2, addr0 + (sizeimage * 5) / 6);
+ regmap_write(regmap, ISC_DAD1 + isc->offsets.dma,
+ addr0 + (sizeimage * 2) / 3);
+ regmap_write(regmap, ISC_DAD2 + isc->offsets.dma,
+ addr0 + (sizeimage * 5) / 6);
break;
case V4L2_PIX_FMT_YUV422P:
- regmap_write(regmap, ISC_DAD1, addr0 + sizeimage / 2);
- regmap_write(regmap, ISC_DAD2, addr0 + (sizeimage * 3) / 4);
+ regmap_write(regmap, ISC_DAD1 + isc->offsets.dma,
+ addr0 + sizeimage / 2);
+ regmap_write(regmap, ISC_DAD2 + isc->offsets.dma,
+ addr0 + (sizeimage * 3) / 4);
break;
default:
break;
@@ -610,7 +614,8 @@ static void isc_start_dma(struct isc_device *isc)
dctrl_dview = isc->config.dctrl_dview;
- regmap_write(regmap, ISC_DCTRL, dctrl_dview | ISC_DCTRL_IE_IS);
+ regmap_write(regmap, ISC_DCTRL + isc->offsets.dma,
+ dctrl_dview | ISC_DCTRL_IE_IS);
spin_lock(&isc->awb_lock);
regmap_write(regmap, ISC_CTRLEN, ISC_CTRL_CAPTURE);
spin_unlock(&isc->awb_lock);
@@ -723,7 +728,7 @@ static int isc_configure(struct isc_device *isc)
regmap_update_bits(regmap, ISC_RLP_CFG + isc->offsets.rlp,
ISC_RLP_CFG_MODE_MASK, rlp_mode);
- regmap_write(regmap, ISC_DCFG, dcfg);
+ regmap_write(regmap, ISC_DCFG + isc->offsets.dma, dcfg);
/* Set the pipeline */
isc_set_pipeline(isc, pipeline);
diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
index 0ab280ab59ec..4940998c82a2 100644
--- a/drivers/media/platform/atmel/atmel-isc-regs.h
+++ b/drivers/media/platform/atmel/atmel-isc-regs.h
@@ -247,6 +247,9 @@
#define ISC_HIS_CFG_RAR BIT(8)
+/* Offset for DMA register specific to sama5d2 product */
+#define ISC_SAMA5D2_DMA_OFFSET 0
+
/* DMA Configuration Register */
#define ISC_DCFG 0x000003e0
#define ISC_DCFG_IMODE_PACKED8 0x0
diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index 652285dc9f52..52a9199d65ee 100644
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -152,6 +152,7 @@ struct isc_ctrls {
* @sub420: Offset for the SUB420 register
* @rlp: Offset for the RLP register
* @his: Offset for the HIS related registers
+ * @dma: Offset for the DMA related registers
*/
struct isc_reg_offsets {
u32 csc;
@@ -160,6 +161,7 @@ struct isc_reg_offsets {
u32 sub420;
u32 rlp;
u32 his;
+ u32 dma;
};
/*
diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 914de4ed63f3..12f56a71db40 100644
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -239,6 +239,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
isc->offsets.sub420 = ISC_SAMA5D2_SUB420_OFFSET;
isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET;
isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET;
+ isc->offsets.dma = ISC_SAMA5D2_DMA_OFFSET;
/* 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-13 11:02 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 10:56 [PATCH v3 00/33] media: atmel: atmel-isc: add support for xisc Eugen Hristev
2021-04-13 10:56 ` Eugen Hristev
2021-04-13 10:56 ` [PATCH v3 01/33] media: atmel: atmel-isc: specialize gamma table into product specific Eugen Hristev
2021-04-13 10:56 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 02/33] media: atmel: atmel-isc: specialize driver name constant Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 03/33] media: atmel: atmel-isc: add checks for limiting frame sizes Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 04/33] media: atmel: atmel-isc: specialize max width and max height Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 05/33] media: atmel: atmel-isc: specialize dma cfg Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 06/33] media: atmel: atmel-isc: extract CSC submodule config into separate function Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 07/33] media: atmel: atmel-isc-base: add id to clock debug message Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 08/33] media: atmel: atmel-isc: create register offsets struct Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 09/33] media: atmel: atmel-isc: extract CBC submodule config into separate function Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 10/33] media: atmel: atmel-isc: add CBC to the reg offsets struct Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 11/33] media: atmel: atmel-isc: add SUB422 and SUB420 to register offsets Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 12/33] media: atmel: atmel-isc: add RLP " Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 13/33] media: atmel: atmel-isc: add HIS " Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev [this message]
2021-04-13 10:57 ` [PATCH v3 14/33] media: atmel: atmel-isc: add DMA " Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 15/33] media: atmel: atmel-isc: add support for version register Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 16/33] media: atmel: atmel-isc: add his_entry to register offsets Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 17/33] media: atmel: atmel-isc: add register description for additional modules Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 18/33] media: atmel: atmel-isc: extend pipeline with extra modules Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 19/33] media: atmel: atmel-isc: add CC initialization function Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 20/33] media: atmel: atmel-isc: create product specific v4l2 controls config Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 21/33] media: atmel: atmel-isc: create callback for DPC submodule product specific Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 22/33] media: atmel: atmel-isc: create callback for GAM " Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 23/33] media: atmel: atmel-isc: create callback for RLP " Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 24/33] media: atmel: atmel-isc: move the formats list into product specific code Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 25/33] media: atmel: atmel-isc: create an adapt pipeline callback for product specific Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 26/33] media: atmel: atmel-isc-regs: add additional fields for sama7g5 type pipeline Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 27/33] media: atmel: atmel-isc-base: add support for more formats and additional pipeline modules Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 28/33] media: atmel: atmel-isc-sama5d2: remove duplicate define Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 29/33] dt-bindings: media: atmel-isc: convert to yaml Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 16:32 ` Rob Herring
2021-04-13 16:32 ` Rob Herring
2021-04-15 8:55 ` [PATCH v4 " Eugen Hristev
2021-04-15 8:55 ` Eugen Hristev
2021-04-15 16:16 ` Rob Herring
2021-04-15 16:16 ` Rob Herring
2021-04-13 10:57 ` [PATCH v3 30/33] dt-bindings: media: add microchip,xisc device bindings Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 30/33] dt-bindings: media: add microchip, xisc " Eugen Hristev
2021-04-13 16:34 ` [PATCH v3 30/33] dt-bindings: media: add microchip,xisc " Rob Herring
2021-04-13 16:34 ` Rob Herring
2021-04-15 8:58 ` [PATCH v4 " Eugen Hristev
2021-04-15 8:58 ` [PATCH v4 30/33] dt-bindings: media: add microchip, xisc " Eugen Hristev
2021-04-15 16:40 ` [PATCH v4 30/33] dt-bindings: media: add microchip,xisc " Rob Herring
2021-04-15 16:40 ` Rob Herring
2021-04-15 18:45 ` [PATCH v5 " Eugen Hristev
2021-04-15 18:45 ` [PATCH v5 30/33] dt-bindings: media: add microchip, xisc " Eugen Hristev
2021-04-16 19:06 ` Rob Herring
2021-04-16 19:06 ` Rob Herring
2021-04-13 10:57 ` [PATCH v3 31/33] media: atmel: atmel-isc: add microchip-xisc driver Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 32/33] MAINTAINERS: update ISC driver bindings file Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
2021-04-13 10:57 ` [PATCH v3 33/33] MAINTAINERS: add xisc files to isc driver entry Eugen Hristev
2021-04-13 10:57 ` Eugen Hristev
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=20210413105731.610028-15-eugen.hristev@microchip.com \
--to=eugen.hristev@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=jacopo@jmondi.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=robh+dt@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.