From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/media/i2c/gc2093.c | 67 ++-------------------------------
1 files changed, 5 insertions(+), 62 deletions(-)
diff --git a/kernel/drivers/media/i2c/gc2093.c b/kernel/drivers/media/i2c/gc2093.c
index aa87a73..f612814 100644
--- a/kernel/drivers/media/i2c/gc2093.c
+++ b/kernel/drivers/media/i2c/gc2093.c
@@ -33,6 +33,7 @@
#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
#include "../platform/rockchip/isp/rkisp_tb_helper.h"
+#include "cam-tb-setup.h"
#define DRIVER_VERSION KERNEL_VERSION(0, 0x01, 0x02)
#define GC2093_NAME "gc2093"
@@ -1612,68 +1613,6 @@
#ifdef CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP
-static u32 rk_cam_hdr;
-static u32 rk_cam_w;
-static u32 rk_cam_h;
-static u32 rk_cam_fps;
-
-static int __init __maybe_unused rk_cam_hdr_setup(char *str)
-{
- int ret = 0;
- unsigned long val = 0;
-
- ret = kstrtoul(str, 0, &val);
- if (!ret)
- rk_cam_hdr = (u32)val;
- else
- pr_err("get rk_cam_hdr fail\n");
- return 1;
-}
-
-static int __init __maybe_unused rk_cam_w_setup(char *str)
-{
- int ret = 0;
- unsigned long val = 0;
-
- ret = kstrtoul(str, 0, &val);
- if (!ret)
- rk_cam_w = (u32)val;
- else
- pr_err("get rk_cam_w fail\n");
- return 1;
-}
-
-static int __init __maybe_unused rk_cam_h_setup(char *str)
-{
- int ret = 0;
- unsigned long val = 0;
-
- ret = kstrtoul(str, 0, &val);
- if (!ret)
- rk_cam_h = (u32)val;
- else
- pr_err("get rk_cam_h fail\n");
- return 1;
-}
-
-static int __init __maybe_unused rk_cam_fps_setup(char *str)
-{
- int ret = 0;
- unsigned long val = 0;
-
- ret = kstrtoul(str, 0, &val);
- if (!ret)
- rk_cam_fps = (u32)val;
- else
- pr_err("get rk_cam_fps fail\n");
- return 1;
-}
-
-__setup("rk_cam_hdr=", rk_cam_hdr_setup);
-__setup("rk_cam_w=", rk_cam_w_setup);
-__setup("rk_cam_h=", rk_cam_h_setup);
-__setup("rk_cam_fps=", rk_cam_fps_setup);
-
static void find_terminal_resolution(struct gc2093 *gc2093)
{
int i = 0;
@@ -1682,6 +1621,10 @@
u32 cur_fps = 0;
u32 dst_fps = 0;
u32 tmp_fps = 0;
+ u32 rk_cam_hdr = get_rk_cam_hdr();
+ u32 rk_cam_w = get_rk_cam_w();
+ u32 rk_cam_h = get_rk_cam_h();
+ u32 rk_cam_fps = get_rk_cam_fps();
if (rk_cam_w == 0 || rk_cam_h == 0 ||
rk_cam_fps == 0)
--
Gitblit v1.6.2