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/os02g10.c | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/kernel/drivers/media/i2c/os02g10.c b/kernel/drivers/media/i2c/os02g10.c
index 60f7ba2..f7dbb79 100644
--- a/kernel/drivers/media/i2c/os02g10.c
+++ b/kernel/drivers/media/i2c/os02g10.c
@@ -101,14 +101,6 @@
#define OS02G10_NUM_SUPPLIES ARRAY_SIZE(OS02G10_supply_names)
-enum os02g10_max_pad {
- PAD0,
- PAD1,
- PAD2,
- PAD3,
- PAD_MAX,
-};
-
struct regval {
u8 addr;
u8 val;
@@ -533,14 +525,12 @@
struct os02g10 *os02g10 = to_os02g10(sd);
const struct os02g10_mode *mode = os02g10->cur_mode;
- mutex_lock(&os02g10->mutex);
fi->interval = mode->max_fps;
- mutex_unlock(&os02g10->mutex);
return 0;
}
-static int os02g10_g_mbus_config(struct v4l2_subdev *sd,
+static int os02g10_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad,
struct v4l2_mbus_config *config)
{
struct os02g10 *os02g10 = to_os02g10(sd);
@@ -552,7 +542,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;
@@ -942,7 +932,6 @@
static const struct v4l2_subdev_video_ops os02g10_video_ops = {
.s_stream = os02g10_s_stream,
.g_frame_interval = os02g10_g_frame_interval,
- .g_mbus_config = os02g10_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops os02g10_pad_ops = {
@@ -951,6 +940,7 @@
.enum_frame_interval = os02g10_enum_frame_interval,
.get_fmt = os02g10_get_fmt,
.set_fmt = os02g10_set_fmt,
+ .get_mbus_config = os02g10_g_mbus_config,
};
static const struct v4l2_subdev_ops os02g10_subdev_ops = {
--
Gitblit v1.6.2