target/linux/at91/patches-5.10/161-media-atmel-atmel-isc-specialize-dma-cfg.patch

   1 From c42305f52560a1be6fc25a2f23579c7b323de654 Mon Sep 17 00:00:00 2001
   2 From: Eugen Hristev <eugen.hristev@microchip.com>
   3 Date: Tue, 13 Apr 2021 12:57:03 +0200
   4 Subject: [PATCH 161/247] media: atmel: atmel-isc: specialize dma cfg
   5
   6 The dma configuration (DCFG) is specific to the product.
   7 Move this configuration in the product specific driver, and add the
   8 field inside the driver struct.
   9
  10 Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
  11 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  12 Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  13 ---
  14  drivers/media/platform/atmel/atmel-isc-base.c    | 3 +--
  15  drivers/media/platform/atmel/atmel-isc.h         | 2 ++
  16  drivers/media/platform/atmel/atmel-sama5d2-isc.c | 3 +++
  17  3 files changed, 6 insertions(+), 2 deletions(-)
  18
  19 diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
  20 index ed0048e79f3b..07ba439eb7e9 100644
  21 --- a/drivers/media/platform/atmel/atmel-isc-base.c
  22 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
  23 @@ -724,8 +724,7 @@ static int isc_configure(struct isc_device *isc)
  24         rlp_mode = isc->config.rlp_cfg_mode;
  25         pipeline = isc->config.bits_pipeline;
  26
  27 -       dcfg = isc->config.dcfg_imode |
  28 -                      ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
  29 +       dcfg = isc->config.dcfg_imode | isc->dcfg;
  30
  31         pfe_cfg0  |= subdev->pfe_cfg0 | ISC_PFE_CFG0_MODE_PROGRESSIVE;
  32         mask = ISC_PFE_CFG0_BPS_MASK | ISC_PFE_CFG0_HPOL_LOW |
  33 diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
  34 index f208fb691ac9..88ec4268de11 100644
  35 --- a/drivers/media/platform/atmel/atmel-isc.h
  36 +++ b/drivers/media/platform/atmel/atmel-isc.h
  37 @@ -149,6 +149,7 @@ struct isc_ctrls {
  38   * @hclock:            Hclock clock input (refer datasheet)
  39   * @ispck:             iscpck clock (refer datasheet)
  40   * @isc_clks:          ISC clocks
  41 + * @dcfg:              DMA master configuration, architecture dependent
  42   *
  43   * @dev:               Registered device driver
  44   * @v4l2_dev:          v4l2 registered device
  45 @@ -196,6 +197,7 @@ struct isc_device {
  46         struct clk              *hclock;
  47         struct clk              *ispck;
  48         struct isc_clk          isc_clks[2];
  49 +       u32                     dcfg;
  50
  51         struct device           *dev;
  52         struct v4l2_device      v4l2_dev;
  53 diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  54 index 39fc8d4f9bdc..12edeb07b618 100644
  55 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  56 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  57 @@ -219,6 +219,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
  58         isc->max_width = ISC_SAMA5D2_MAX_SUPPORT_WIDTH;
  59         isc->max_height = ISC_SAMA5D2_MAX_SUPPORT_HEIGHT;
  60
  61 +       /* sama5d2-isc - 8 bits per beat */
  62 +       isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
  63 +
  64         ret = isc_pipeline_init(isc);
  65         if (ret)
  66                 return ret;
  67 --
  68 2.32.0
  69