media: rockchip: isp: support 3a part of isp2.0

Change-Id: I5650286494b09e9d0dbda651d84761327621de11 Signed-off-by: Cai YiWei <cyw@rock-chips.com>
rockchip-linux · May 25, 2020 · e631e47 · e631e47
1 parent b0835d6
commit e631e47
Show file tree

Hide file tree

Showing 20 changed files with 8,127 additions and 2,950 deletions.
diff --git a/drivers/media/platform/rockchip/isp/Makefile b/drivers/media/platform/rockchip/isp/Makefile
@@ -5,7 +5,11 @@ video_rkisp-objs += rkisp.o \
 			dev.o \
 			regs.o \
 			isp_stats.o \
+			isp_stats_v1x.o \
+			isp_stats_v2x.o \
 			isp_params.o \
+			isp_params_v1x.o \
+			isp_params_v2x.o \
 			capture.o \
 			dmarx.o \
 			csi.o \

diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c
@@ -591,11 +591,13 @@ static irqreturn_t rkisp_irq_handler(int irq, void *ctx)
 {
 	struct device *dev = ctx;
 	struct rkisp_device *rkisp_dev = dev_get_drvdata(dev);
-	unsigned int mis_val;
+	unsigned int mis_val, mis_3a = 0;
 
 	mis_val = readl(rkisp_dev->base_addr + CIF_ISP_MIS);
-	if (mis_val)
-		rkisp_isp_isr(mis_val, rkisp_dev);
+	if (rkisp_dev->isp_ver == ISP_V20)
+		mis_3a = readl(rkisp_dev->base_addr + ISP_ISP3A_MIS);
+	if (mis_val || mis_3a)
+		rkisp_isp_isr(mis_val, mis_3a, rkisp_dev);
 
 	mis_val = readl(rkisp_dev->base_addr + CIF_MIPI_MIS);
 	if (mis_val)
@@ -612,11 +614,13 @@ static irqreturn_t rkisp_isp_irq_hdl(int irq, void *ctx)
 {
 	struct device *dev = ctx;
 	struct rkisp_device *rkisp_dev = dev_get_drvdata(dev);
-	unsigned int mis_val;
+	unsigned int mis_val, mis_3a = 0;
 
 	mis_val = readl(rkisp_dev->base_addr + CIF_ISP_MIS);
-	if (mis_val)
-		rkisp_isp_isr(mis_val, rkisp_dev);
+	if (rkisp_dev->isp_ver == ISP_V20)
+		mis_3a = readl(rkisp_dev->base_addr + ISP_ISP3A_MIS);
+	if (mis_val || mis_3a)
+		rkisp_isp_isr(mis_val, mis_3a, rkisp_dev);
 
 	return IRQ_HANDLED;
 }