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/ov02k10.c | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/kernel/drivers/media/i2c/ov02k10.c b/kernel/drivers/media/i2c/ov02k10.c
index 4354f57..db5dcbe 100644
--- a/kernel/drivers/media/i2c/ov02k10.c
+++ b/kernel/drivers/media/i2c/ov02k10.c
@@ -116,14 +116,6 @@
#define OV02K10_NUM_SUPPLIES ARRAY_SIZE(ov02k10_supply_names)
-enum ov02k10_max_pad {
- PAD0,
- PAD1,
- PAD2,
- PAD3,
- PAD_MAX,
-};
-
struct regval {
u16 addr;
u8 val;
@@ -837,14 +829,12 @@
struct ov02k10 *ov02k10 = to_ov02k10(sd);
const struct ov02k10_mode *mode = ov02k10->cur_mode;
- mutex_lock(&ov02k10->mutex);
fi->interval = mode->max_fps;
- mutex_unlock(&ov02k10->mutex);
return 0;
}
-static int ov02k10_g_mbus_config(struct v4l2_subdev *sd,
+static int ov02k10_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
struct ov02k10 *ov02k10 = to_ov02k10(sd);
@@ -861,7 +851,7 @@
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK |
V4L2_MBUS_CSI2_CHANNEL_1;
- config->type = V4L2_MBUS_CSI2;
+ config->type = V4L2_MBUS_CSI2_DPHY;
config->flags = val;
return 0;
@@ -1573,7 +1563,6 @@
static const struct v4l2_subdev_video_ops ov02k10_video_ops = {
.s_stream = ov02k10_s_stream,
.g_frame_interval = ov02k10_g_frame_interval,
- .g_mbus_config = ov02k10_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops ov02k10_pad_ops = {
@@ -1583,6 +1572,7 @@
.get_fmt = ov02k10_get_fmt,
.set_fmt = ov02k10_set_fmt,
.get_selection = ov02k10_get_selection,
+ .get_mbus_config = ov02k10_g_mbus_config,
};
static const struct v4l2_subdev_ops ov02k10_subdev_ops = {
--
Gitblit v1.6.2