72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From bce46a8a620a796ca3cfe5bff61baf6744074986 Mon Sep 17 00:00:00 2001
|
|
From: Eugen Hristev <eugen.hristev@microchip.com>
|
|
Date: Tue, 13 Apr 2021 12:57:14 +0200
|
|
Subject: [PATCH 172/247] 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>
|
|
---
|
|
drivers/media/platform/atmel/atmel-isc-base.c | 3 ++-
|
|
drivers/media/platform/atmel/atmel-isc-regs.h | 2 ++
|
|
drivers/media/platform/atmel/atmel-isc.h | 2 ++
|
|
drivers/media/platform/atmel/atmel-sama5d2-isc.c | 1 +
|
|
4 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- 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_de
|
|
*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;
|
|
/*
|
|
--- 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
|
|
|
|
--- a/drivers/media/platform/atmel/atmel-isc.h
|
|
+++ b/drivers/media/platform/atmel/atmel-isc.h
|
|
@@ -153,6 +153,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;
|
|
@@ -163,6 +164,7 @@ struct isc_reg_offsets {
|
|
u32 his;
|
|
u32 dma;
|
|
u32 version;
|
|
+ u32 his_entry;
|
|
};
|
|
|
|
/*
|
|
--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
+++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
|
|
@@ -260,6 +260,7 @@ static int atmel_isc_probe(struct platfo
|
|
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;
|