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/ov2718.c | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/kernel/drivers/media/i2c/ov2718.c b/kernel/drivers/media/i2c/ov2718.c
index 61fb73c..ecfa533 100644
--- a/kernel/drivers/media/i2c/ov2718.c
+++ b/kernel/drivers/media/i2c/ov2718.c
@@ -110,14 +110,6 @@
#define OV2718_NAME "ov2718"
-enum ov2718_max_pad {
- PAD0, /* link to isp */
- PAD1, /* link to csi wr0 | hdr x2:L x3:M */
- PAD2, /* link to csi wr1 | hdr x3:L */
- PAD3, /* link to csi wr2 | hdr x2:M x3:S */
- PAD_MAX,
-};
-
struct ov2718_gpio {
int pltfrm_gpio;
const char *label;
@@ -7921,9 +7913,7 @@
struct ov2718 *ov2718 = to_ov2718(sd);
const struct ov2718_mode *mode = ov2718->cur_mode;
- mutex_lock(&ov2718->mutex);
fi->interval = mode->max_fps;
- mutex_unlock(&ov2718->mutex);
return 0;
}
@@ -7998,7 +7988,7 @@
}
}
-static int ov2718_g_mbus_config(struct v4l2_subdev *sd,
+static int ov2718_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
struct ov2718 *ov2718 = to_ov2718(sd);
@@ -8015,7 +8005,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;
@@ -8572,7 +8562,6 @@
static const struct v4l2_subdev_video_ops ov2718_video_ops = {
.s_stream = ov2718_s_stream,
.g_frame_interval = ov2718_g_frame_interval,
- .g_mbus_config = ov2718_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops ov2718_pad_ops = {
@@ -8581,6 +8570,7 @@
.enum_frame_interval = ov2718_enum_frame_interval,
.get_fmt = ov2718_get_fmt,
.set_fmt = ov2718_set_fmt,
+ .get_mbus_config = ov2718_g_mbus_config,
};
static const struct v4l2_subdev_core_ops ov2718_core_ops = {
--
Gitblit v1.6.2