hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/i2c/ov9281.c
....@@ -667,9 +667,7 @@
667667 struct ov9281 *ov9281 = to_ov9281(sd);
668668 const struct ov9281_mode *mode = ov9281->cur_mode;
669669
670
- mutex_lock(&ov9281->mutex);
671670 fi->interval = mode->max_fps;
672
- mutex_unlock(&ov9281->mutex);
673671
674672 return 0;
675673 }
....@@ -1012,7 +1010,7 @@
10121010 return 0;
10131011 }
10141012
1015
-static int ov9281_g_mbus_config(struct v4l2_subdev *sd,
1013
+static int ov9281_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
10161014 struct v4l2_mbus_config *config)
10171015 {
10181016 u32 val = 0;
....@@ -1020,7 +1018,7 @@
10201018 val = 1 << (OV9281_LANES - 1) |
10211019 V4L2_MBUS_CSI2_CHANNEL_0 |
10221020 V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
1023
- config->type = V4L2_MBUS_CSI2;
1021
+ config->type = V4L2_MBUS_CSI2_DPHY;
10241022 config->flags = val;
10251023
10261024 return 0;
....@@ -1048,7 +1046,6 @@
10481046 static const struct v4l2_subdev_video_ops ov9281_video_ops = {
10491047 .s_stream = ov9281_s_stream,
10501048 .g_frame_interval = ov9281_g_frame_interval,
1051
- .g_mbus_config = ov9281_g_mbus_config,
10521049 };
10531050
10541051 static const struct v4l2_subdev_pad_ops ov9281_pad_ops = {
....@@ -1057,6 +1054,7 @@
10571054 .enum_frame_interval = ov9281_enum_frame_interval,
10581055 .get_fmt = ov9281_get_fmt,
10591056 .set_fmt = ov9281_set_fmt,
1057
+ .get_mbus_config = ov9281_g_mbus_config,
10601058 };
10611059
10621060 static const struct v4l2_subdev_ops ov9281_subdev_ops = {