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/gc5025.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/drivers/media/i2c/gc5025.c b/kernel/drivers/media/i2c/gc5025.c
index 3d34a11..1d3b4c0 100644
--- a/kernel/drivers/media/i2c/gc5025.c
+++ b/kernel/drivers/media/i2c/gc5025.c
@@ -544,9 +544,7 @@
struct gc5025 *gc5025 = to_gc5025(sd);
const struct gc5025_mode *mode = gc5025->cur_mode;
- mutex_lock(&gc5025->mutex);
fi->interval = mode->max_fps;
- mutex_unlock(&gc5025->mutex);
return 0;
}
@@ -1502,16 +1500,14 @@
if (fie->index >= ARRAY_SIZE(supported_modes))
return -EINVAL;
- if (fie->code != MEDIA_BUS_FMT_SRGGB10_1X10)
- return -EINVAL;
-
+ fie->code = MEDIA_BUS_FMT_SRGGB10_1X10;
fie->width = supported_modes[fie->index].width;
fie->height = supported_modes[fie->index].height;
fie->interval = supported_modes[fie->index].max_fps;
return 0;
}
-static int gc5025_g_mbus_config(struct v4l2_subdev *sd,
+static int gc5025_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
u32 val = 0;
@@ -1520,7 +1516,7 @@
V4L2_MBUS_CSI2_CHANNEL_0 |
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
- config->type = V4L2_MBUS_CSI2;
+ config->type = V4L2_MBUS_CSI2_DPHY;
config->flags = val;
return 0;
@@ -1563,7 +1559,6 @@
static const struct v4l2_subdev_video_ops gc5025_video_ops = {
.s_stream = gc5025_s_stream,
.g_frame_interval = gc5025_g_frame_interval,
- .g_mbus_config = gc5025_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops gc5025_pad_ops = {
@@ -1573,6 +1568,7 @@
.get_fmt = gc5025_get_fmt,
.set_fmt = gc5025_set_fmt,
.get_selection = gc5025_get_selection,
+ .get_mbus_config = gc5025_g_mbus_config,
};
static const struct v4l2_subdev_ops gc5025_subdev_ops = {
--
Gitblit v1.6.2