hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/i2c/ov2718.c
....@@ -110,14 +110,6 @@
110110
111111 #define OV2718_NAME "ov2718"
112112
113
-enum ov2718_max_pad {
114
- PAD0, /* link to isp */
115
- PAD1, /* link to csi wr0 | hdr x2:L x3:M */
116
- PAD2, /* link to csi wr1 | hdr x3:L */
117
- PAD3, /* link to csi wr2 | hdr x2:M x3:S */
118
- PAD_MAX,
119
-};
120
-
121113 struct ov2718_gpio {
122114 int pltfrm_gpio;
123115 const char *label;
....@@ -7921,9 +7913,7 @@
79217913 struct ov2718 *ov2718 = to_ov2718(sd);
79227914 const struct ov2718_mode *mode = ov2718->cur_mode;
79237915
7924
- mutex_lock(&ov2718->mutex);
79257916 fi->interval = mode->max_fps;
7926
- mutex_unlock(&ov2718->mutex);
79277917
79287918 return 0;
79297919 }
....@@ -7998,7 +7988,7 @@
79987988 }
79997989 }
80007990
8001
-static int ov2718_g_mbus_config(struct v4l2_subdev *sd,
7991
+static int ov2718_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
80027992 struct v4l2_mbus_config *config)
80037993 {
80047994 struct ov2718 *ov2718 = to_ov2718(sd);
....@@ -8015,7 +8005,7 @@
80158005 V4L2_MBUS_CSI2_CONTINUOUS_CLOCK |
80168006 V4L2_MBUS_CSI2_CHANNEL_1;
80178007
8018
- config->type = V4L2_MBUS_CSI2;
8008
+ config->type = V4L2_MBUS_CSI2_DPHY;
80198009 config->flags = val;
80208010
80218011 return 0;
....@@ -8572,7 +8562,6 @@
85728562 static const struct v4l2_subdev_video_ops ov2718_video_ops = {
85738563 .s_stream = ov2718_s_stream,
85748564 .g_frame_interval = ov2718_g_frame_interval,
8575
- .g_mbus_config = ov2718_g_mbus_config,
85768565 };
85778566
85788567 static const struct v4l2_subdev_pad_ops ov2718_pad_ops = {
....@@ -8581,6 +8570,7 @@
85818570 .enum_frame_interval = ov2718_enum_frame_interval,
85828571 .get_fmt = ov2718_get_fmt,
85838572 .set_fmt = ov2718_set_fmt,
8573
+ .get_mbus_config = ov2718_g_mbus_config,
85848574 };
85858575
85868576 static const struct v4l2_subdev_core_ops ov2718_core_ops = {