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/ar0230.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/kernel/drivers/media/i2c/ar0230.c b/kernel/drivers/media/i2c/ar0230.c
index 654ca7c..9ccdc50 100644
--- a/kernel/drivers/media/i2c/ar0230.c
+++ b/kernel/drivers/media/i2c/ar0230.c
@@ -141,9 +141,9 @@
static const struct regval ar0230_regs[] = {
#ifdef USE_HDR_MODE
{0x301A, 0x0001},
- {REG_DELAY, 2000},
+ {REG_DELAY, 20000},
{0x301A, 0x10D8},
- {REG_DELAY, 2000},
+ {REG_DELAY, 20000},
{0x3088, 0x8000},
{0x3086, 0x4558},
{0x3086, 0x729B},
@@ -1144,9 +1144,7 @@
struct ar0230 *ar0230 = to_ar0230(sd);
const struct ar0230_mode *mode = ar0230->cur_mode;
- mutex_lock(&ar0230->mutex);
fi->interval = mode->max_fps;
- mutex_unlock(&ar0230->mutex);
return 0;
}
@@ -1292,7 +1290,7 @@
}
#endif
-static int ar0230_g_mbus_config(struct v4l2_subdev *sd,
+static int ar0230_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
config->type = V4L2_MBUS_PARALLEL;
@@ -1309,9 +1307,7 @@
if (fie->index >= ARRAY_SIZE(supported_modes))
return -EINVAL;
- if (fie->code != PIX_FORMAT)
- return -EINVAL;
-
+ fie->code = PIX_FORMAT;
fie->width = supported_modes[fie->index].width;
fie->height = supported_modes[fie->index].height;
fie->interval = supported_modes[fie->index].max_fps;
@@ -1339,7 +1335,6 @@
static const struct v4l2_subdev_video_ops ar0230_video_ops = {
.s_stream = ar0230_s_stream,
- .g_mbus_config = ar0230_g_mbus_config,
.g_frame_interval = ar0230_g_frame_interval,
};
@@ -1349,6 +1344,7 @@
.enum_frame_interval = ar0230_enum_frame_interval,
.get_fmt = ar0230_get_fmt,
.set_fmt = ar0230_set_fmt,
+ .get_mbus_config = ar0230_g_mbus_config,
};
static const struct v4l2_subdev_ops ar0230_subdev_ops = {
--
Gitblit v1.6.2