From 9999e48639b3cecb08ffb37358bcba3b48161b29 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 10 May 2024 08:50:17 +0000
Subject: [PATCH] add ax88772_rst
---
kernel/drivers/media/platform/rockchip/isp/isp_ispp.h | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h b/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h
index f39f177..16f106c 100644
--- a/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h
+++ b/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h
@@ -7,8 +7,8 @@
#include <linux/platform_device.h>
#include <media/v4l2-subdev.h>
#include <media/videobuf2-v4l2.h>
-#include <linux/rkisp1-config.h>
-#include <linux/rkispp-config.h>
+#include <linux/rk-isp1-config.h>
+#include <linux/rk-ispp-config.h>
#define RKISP_BUF_MAX 2
#define RKISPP_BUF_MAX 2
@@ -40,10 +40,6 @@
DEV_ID1,
DEV_ID2,
DEV_ID3,
- DEV_ID4,
- DEV_ID5,
- DEV_ID6,
- DEV_ID7,
DEV_MAX,
};
@@ -82,6 +78,7 @@
u32 w;
u32 h;
u32 fps;
+ bool is_fix;
};
struct rkisp_ispp_mode {
@@ -126,7 +123,7 @@
int __init rkispp_hw_drv_init(void);
-#if IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V20)
+#if IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V20) || IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V30)
void rkisp_get_bridge_sd(struct platform_device *dev,
struct v4l2_subdev **sd);
#else
@@ -136,7 +133,5 @@
*sd = NULL;
}
#endif
-
-extern const struct vb2_mem_ops vb2_rdma_sg_memops;
#endif
--
Gitblit v1.6.2