target/linux/at91/patches-5.10/172-media-atmel-atmel-isc-add-his_entry-to-register-offs.patch

   1 From bce46a8a620a796ca3cfe5bff61baf6744074986 Mon Sep 17 00:00:00 2001
   2 From: Eugen Hristev <eugen.hristev@microchip.com>
   3 Date: Tue, 13 Apr 2021 12:57:14 +0200
   4 Subject: [PATCH 172/247] media: atmel: atmel-isc: add his_entry to register
   5  offsets
   6
   7 Add his_entry to the reg offsets struct.
   8 This will allow different products to have a different reg offset for this
   9 particular module.
  10
  11 Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
  12 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  13 Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  14 ---
  15  drivers/media/platform/atmel/atmel-isc-base.c    | 3 ++-
  16  drivers/media/platform/atmel/atmel-isc-regs.h    | 2 ++
  17  drivers/media/platform/atmel/atmel-isc.h         | 2 ++
  18  drivers/media/platform/atmel/atmel-sama5d2-isc.c | 1 +
  19  4 files changed, 7 insertions(+), 1 deletion(-)
  20
  21 diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
  22 index e010429fc44d..cfe60b2882ac 100644
  23 --- a/drivers/media/platform/atmel/atmel-isc-base.c
  24 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
  25 @@ -1684,7 +1684,8 @@ static void isc_hist_count(struct isc_device *isc, u32 *min, u32 *max)
  26         *min = 0;
  27         *max = HIST_ENTRIES;
  28
  29 -       regmap_bulk_read(regmap, ISC_HIS_ENTRY, hist_entry, HIST_ENTRIES);
  30 +       regmap_bulk_read(regmap, ISC_HIS_ENTRY + isc->offsets.his_entry,
  31 +                        hist_entry, HIST_ENTRIES);
  32
  33         *hist_count = 0;
  34         /*
  35 diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
  36 index 344668dcfcf4..a15c13e1a833 100644
  37 --- a/drivers/media/platform/atmel/atmel-isc-regs.h
  38 +++ b/drivers/media/platform/atmel/atmel-isc-regs.h
  39 @@ -300,6 +300,8 @@
  40  /* Version Register */
  41  #define ISC_VERSION    0x0000040c
  42
  43 +/* Offset for version register specific to sama5d2 product */
  44 +#define ISC_SAMA5D2_HIS_ENTRY_OFFSET   0
  45  /* Histogram Entry */
  46  #define ISC_HIS_ENTRY  0x00000410
  47
  48 diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
  49 index 13ee19d99c2e..513b2b920b1f 100644
  50 --- a/drivers/media/platform/atmel/atmel-isc.h
  51 +++ b/drivers/media/platform/atmel/atmel-isc.h
  52 @@ -153,6 +153,7 @@ struct isc_ctrls {
  53   * @his:               Offset for the HIS related registers
  54   * @dma:               Offset for the DMA related registers
  55   * @version:           Offset for the version register
  56 + * @his_entry:         Offset for the HIS entries registers
  57   */
  58  struct isc_reg_offsets {
  59         u32 csc;
  60 @@ -163,6 +164,7 @@ struct isc_reg_offsets {
  61         u32 his;
  62         u32 dma;
  63         u32 version;
  64 +       u32 his_entry;
  65  };
  66
  67  /*
  68 diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  69 index aebf38dde2d2..ed575eb3726d 100644
  70 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  71 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  72 @@ -260,6 +260,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
  73         isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET;
  74         isc->offsets.dma = ISC_SAMA5D2_DMA_OFFSET;
  75         isc->offsets.version = ISC_SAMA5D2_VERSION_OFFSET;
  76 +       isc->offsets.his_entry = ISC_SAMA5D2_HIS_ENTRY_OFFSET;
  77
  78         /* sama5d2-isc - 8 bits per beat */
  79         isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
  80 --
  81 2.32.0
  82