media: atmel: atmel-isc: add his_entry to register offsets

Add his_entry 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>

diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
index e010429fc44de49046cbabf36af1b66bf77a98f9..cfe60b2882acfa513fe1ce47973555c05fe13c6f 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-base.c
+++ b/drivers/media/platform/atmel/atmel-isc-base.c
@@ -1684,7 +1684,8 @@ static void isc_hist_count(struct isc_device *isc, u32 *min, u32 *max)
        *min = 0;
        *max = HIST_ENTRIES;
 
-       regmap_bulk_read(regmap, ISC_HIS_ENTRY, hist_entry, HIST_ENTRIES);
+       regmap_bulk_read(regmap, ISC_HIS_ENTRY + isc->offsets.his_entry,
+                        hist_entry, HIST_ENTRIES);
 
        *hist_count = 0;
        /*

diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
index 344668dcfcf4cd2b5edf505ccef68cac310220b2..a15c13e1a833f5f6087c62aff8c07f71098d5634 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc-regs.h
+++ b/drivers/media/platform/atmel/atmel-isc-regs.h
@@ -300,6 +300,8 @@
 /* Version Register */
 #define ISC_VERSION    0x0000040c
 
+/* Offset for version register specific to sama5d2 product */
+#define ISC_SAMA5D2_HIS_ENTRY_OFFSET   0
 /* Histogram Entry */
 #define ISC_HIS_ENTRY  0x00000410
 

diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
index 676a5be1ee8ca587f527f59c9ab7daa80aa26785..c5d956fd20a0df63faf397acaaf67b7fe2c3be40 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isc.h
+++ b/drivers/media/platform/atmel/atmel-isc.h
@@ -154,6 +154,7 @@ struct isc_ctrls {
  * @his:               Offset for the HIS related registers
  * @dma:               Offset for the DMA related registers
  * @version:           Offset for the version register
+ * @his_entry:         Offset for the HIS entries registers
  */
 struct isc_reg_offsets {
        u32 csc;
@@ -164,6 +165,7 @@ struct isc_reg_offsets {
        u32 his;
        u32 dma;
        u32 version;
+       u32 his_entry;
 };
 
 /*

diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
index 059dc5d3c664797e000c8db94527ef2e2ad808e7..72cb91b4b8baa583d942ae450c8c8297a75ae751 100644 (file)
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
@@ -239,6 +239,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
        isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET;
        isc->offsets.dma = ISC_SAMA5D2_DMA_OFFSET;
        isc->offsets.version = ISC_SAMA5D2_VERSION_OFFSET;
+       isc->offsets.his_entry = ISC_SAMA5D2_HIS_ENTRY_OFFSET;
 
        /* sama5d2-isc - 8 bits per beat */
        isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;