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 --- a/drivers/media/platform/atmel/atmel-isc-base.c
  22 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
  23 @@ -1684,7 +1684,8 @@ static void isc_hist_count(struct isc_de
  24         *min = 0;
  25         *max = HIST_ENTRIES;
  26
  27 -       regmap_bulk_read(regmap, ISC_HIS_ENTRY, hist_entry, HIST_ENTRIES);
  28 +       regmap_bulk_read(regmap, ISC_HIS_ENTRY + isc->offsets.his_entry,
  29 +                        hist_entry, HIST_ENTRIES);
  30
  31         *hist_count = 0;
  32         /*
  33 --- a/drivers/media/platform/atmel/atmel-isc-regs.h
  34 +++ b/drivers/media/platform/atmel/atmel-isc-regs.h
  35 @@ -300,6 +300,8 @@
  36  /* Version Register */
  37  #define ISC_VERSION    0x0000040c
  38
  39 +/* Offset for version register specific to sama5d2 product */
  40 +#define ISC_SAMA5D2_HIS_ENTRY_OFFSET   0
  41  /* Histogram Entry */
  42  #define ISC_HIS_ENTRY  0x00000410
  43
  44 --- a/drivers/media/platform/atmel/atmel-isc.h
  45 +++ b/drivers/media/platform/atmel/atmel-isc.h
  46 @@ -153,6 +153,7 @@ struct isc_ctrls {
  47   * @his:               Offset for the HIS related registers
  48   * @dma:               Offset for the DMA related registers
  49   * @version:           Offset for the version register
  50 + * @his_entry:         Offset for the HIS entries registers
  51   */
  52  struct isc_reg_offsets {
  53         u32 csc;
  54 @@ -163,6 +164,7 @@ struct isc_reg_offsets {
  55         u32 his;
  56         u32 dma;
  57         u32 version;
  58 +       u32 his_entry;
  59  };
  60
  61  /*
  62 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  63 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  64 @@ -260,6 +260,7 @@ static int atmel_isc_probe(struct platfo
  65         isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET;
  66         isc->offsets.dma = ISC_SAMA5D2_DMA_OFFSET;
  67         isc->offsets.version = ISC_SAMA5D2_VERSION_OFFSET;
  68 +       isc->offsets.his_entry = ISC_SAMA5D2_HIS_ENTRY_OFFSET;
  69
  70         /* sama5d2-isc - 8 bits per beat */
  71         isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;