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/imx317.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/kernel/drivers/media/i2c/imx317.c b/kernel/drivers/media/i2c/imx317.c
index 3540fcc..a34e6a5 100644
--- a/kernel/drivers/media/i2c/imx317.c
+++ b/kernel/drivers/media/i2c/imx317.c
@@ -845,9 +845,7 @@
struct imx317 *imx317 = to_imx317(sd);
const struct imx317_mode *mode = imx317->cur_mode;
- mutex_lock(&imx317->mutex);
fi->interval = mode->max_fps;
- mutex_unlock(&imx317->mutex);
return 0;
}
@@ -1178,16 +1176,14 @@
if (fie->index >= imx317->cfg_num)
return -EINVAL;
- if (fie->code != IMX317_MEDIA_BUS_FMT)
- return -EINVAL;
-
+ fie->code = IMX317_MEDIA_BUS_FMT;
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 imx317_g_mbus_config(struct v4l2_subdev *sd,
+static int imx317_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
struct v4l2_mbus_config *config)
{
u32 val = 0;
@@ -1196,7 +1192,7 @@
val = 1 << (imx317->lane_num - 1) |
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;
@@ -1224,7 +1220,6 @@
static const struct v4l2_subdev_video_ops imx317_video_ops = {
.s_stream = imx317_s_stream,
.g_frame_interval = imx317_g_frame_interval,
- .g_mbus_config = imx317_g_mbus_config,
};
static const struct v4l2_subdev_pad_ops imx317_pad_ops = {
@@ -1233,6 +1228,7 @@
.enum_frame_interval = imx317_enum_frame_interval,
.get_fmt = imx317_get_fmt,
.set_fmt = imx317_set_fmt,
+ .get_mbus_config = imx317_g_mbus_config,
};
static const struct v4l2_subdev_ops imx317_subdev_ops = {
--
Gitblit v1.6.2