at91: kernel v5.15: remove upstreamed patches

[openwrt/staging/dedeckeh.git] / target / linux / at91 / patches-5.15 / 170-media-atmel-atmel-isc-add-DMA-to-register-offsets.patch

diff --git a/target/linux/at91/patches-5.15/170-media-atmel-atmel-isc-add-DMA-to-register-offsets.patch b/target/linux/at91/patches-5.15/170-media-atmel-atmel-isc-add-DMA-to-register-offsets.patch
deleted file mode 100644 (file)
index ef7104e..0000000
--- a/target/linux/at91/patches-5.15/170-media-atmel-atmel-isc-add-DMA-to-register-offsets.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 7173e54070a9b530c8c16e0a507be71385133abd Mon Sep 17 00:00:00 2001
-From: Eugen Hristev <eugen.hristev@microchip.com>
-Date: Tue, 13 Apr 2021 12:57:12 +0200
-Subject: [PATCH 170/247] media: atmel: atmel-isc: add DMA to register offsets
-
-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>
-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 | 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(-)
-
---- a/drivers/media/platform/atmel/atmel-isc-base.c
-+++ b/drivers/media/platform/atmel/atmel-isc-base.c
-@@ -601,16 +601,20 @@ static void isc_start_dma(struct isc_dev
-                          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;
-@@ -618,7 +622,8 @@ static void isc_start_dma(struct isc_dev
- 
-       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);
-@@ -731,7 +736,7 @@ static int isc_configure(struct isc_devi
-       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);
---- 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
---- a/drivers/media/platform/atmel/atmel-isc.h
-+++ b/drivers/media/platform/atmel/atmel-isc.h
-@@ -151,6 +151,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;
-@@ -159,6 +160,7 @@ struct isc_reg_offsets {
-       u32 sub420;
-       u32 rlp;
-       u32 his;
-+      u32 dma;
- };
- 
- /*
---- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
-@@ -257,6 +257,7 @@ static int atmel_isc_probe(struct platfo
-       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;