target/linux/at91/patches-5.10/169-media-atmel-atmel-isc-add-HIS-to-register-offsets.patch

   1 From 8c19aa14b8303a0e7c4bae42f3f00f9a2a65b0db Mon Sep 17 00:00:00 2001
   2 From: Eugen Hristev <eugen.hristev@microchip.com>
   3 Date: Tue, 13 Apr 2021 12:57:11 +0200
   4 Subject: [PATCH 169/247] media: atmel: atmel-isc: add HIS to register offsets
   5
   6 The HIS submodule is a part of the atmel-isc pipeline, and stands for
   7 Histogram. This module performs a color histogram that can be read and used
   8 by the main processor.
   9 Add his to the reg offsets struct.
  10 This will allow different products to have a different reg offset for this
  11 particular module.
  12
  13 Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
  14 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  15 Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  16 ---
  17  drivers/media/platform/atmel/atmel-isc-base.c    | 11 +++++++----
  18  drivers/media/platform/atmel/atmel-isc-regs.h    |  2 ++
  19  drivers/media/platform/atmel/atmel-isc.h         |  2 ++
  20  drivers/media/platform/atmel/atmel-sama5d2-isc.c |  1 +
  21  4 files changed, 12 insertions(+), 4 deletions(-)
  22
  23 diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
  24 index 25c90b821067..5c95aa45cf6c 100644
  25 --- a/drivers/media/platform/atmel/atmel-isc-base.c
  26 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
  27 @@ -686,12 +686,13 @@ static void isc_set_histogram(struct isc_device *isc, bool enable)
  28         struct isc_ctrls *ctrls = &isc->ctrls;
  29
  30         if (enable) {
  31 -               regmap_write(regmap, ISC_HIS_CFG,
  32 +               regmap_write(regmap, ISC_HIS_CFG + isc->offsets.his,
  33                              ISC_HIS_CFG_MODE_GR |
  34                              (isc->config.sd_format->cfa_baycfg
  35                                         << ISC_HIS_CFG_BAYSEL_SHIFT) |
  36                                         ISC_HIS_CFG_RAR);
  37 -               regmap_write(regmap, ISC_HIS_CTRL, ISC_HIS_CTRL_EN);
  38 +               regmap_write(regmap, ISC_HIS_CTRL + isc->offsets.his,
  39 +                            ISC_HIS_CTRL_EN);
  40                 regmap_write(regmap, ISC_INTEN, ISC_INT_HISDONE);
  41                 ctrls->hist_id = ISC_HIS_CFG_MODE_GR;
  42                 isc_update_profile(isc);
  43 @@ -700,7 +701,8 @@ static void isc_set_histogram(struct isc_device *isc, bool enable)
  44                 ctrls->hist_stat = HIST_ENABLED;
  45         } else {
  46                 regmap_write(regmap, ISC_INTDIS, ISC_INT_HISDONE);
  47 -               regmap_write(regmap, ISC_HIS_CTRL, ISC_HIS_CTRL_DIS);
  48 +               regmap_write(regmap, ISC_HIS_CTRL + isc->offsets.his,
  49 +                            ISC_HIS_CTRL_DIS);
  50
  51                 ctrls->hist_stat = HIST_DISABLED;
  52         }
  53 @@ -1836,7 +1838,8 @@ static void isc_awb_work(struct work_struct *w)
  54                         ctrls->awb = ISC_WB_NONE;
  55                 }
  56         }
  57 -       regmap_write(regmap, ISC_HIS_CFG, hist_id | baysel | ISC_HIS_CFG_RAR);
  58 +       regmap_write(regmap, ISC_HIS_CFG + isc->offsets.his,
  59 +                    hist_id | baysel | ISC_HIS_CFG_RAR);
  60         isc_update_profile(isc);
  61         /* if awb has been disabled, we don't need to start another histogram */
  62         if (ctrls->awb)
  63 diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
  64 index 2205484e04fc..0ab280ab59ec 100644
  65 --- a/drivers/media/platform/atmel/atmel-isc-regs.h
  66 +++ b/drivers/media/platform/atmel/atmel-isc-regs.h
  67 @@ -224,6 +224,8 @@
  68  #define ISC_RLP_CFG_MODE_YYCC_LIMITED   0xc
  69  #define ISC_RLP_CFG_MODE_MASK           GENMASK(3, 0)
  70
  71 +/* Offset for HIS register specific to sama5d2 product */
  72 +#define ISC_SAMA5D2_HIS_OFFSET 0
  73  /* Histogram Control Register */
  74  #define ISC_HIS_CTRL   0x000003d4
  75
  76 diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
  77 index 4a5293c66f49..97ec4c58297e 100644
  78 --- a/drivers/media/platform/atmel/atmel-isc.h
  79 +++ b/drivers/media/platform/atmel/atmel-isc.h
  80 @@ -150,6 +150,7 @@ struct isc_ctrls {
  81   * @sub422:            Offset for the SUB422 register
  82   * @sub420:            Offset for the SUB420 register
  83   * @rlp:               Offset for the RLP register
  84 + * @his:               Offset for the HIS related registers
  85   */
  86  struct isc_reg_offsets {
  87         u32 csc;
  88 @@ -157,6 +158,7 @@ struct isc_reg_offsets {
  89         u32 sub422;
  90         u32 sub420;
  91         u32 rlp;
  92 +       u32 his;
  93  };
  94
  95  /*
  96 diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  97 index b01b5b9f229b..db93cb76c08b 100644
  98 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  99 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
 100 @@ -256,6 +256,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
 101         isc->offsets.sub422 = ISC_SAMA5D2_SUB422_OFFSET;
 102         isc->offsets.sub420 = ISC_SAMA5D2_SUB420_OFFSET;
 103         isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET;
 104 +       isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET;
 105
 106         /* sama5d2-isc - 8 bits per beat */
 107         isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
 108 --
 109 2.32.0
 110