hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/media/i2c/gc02m2.c
....@@ -93,11 +93,6 @@
9393
9494 #define to_gc02m2(sd) container_of(sd, struct gc02m2, subdev)
9595
96
-enum gc02m2_max_pad {
97
- PAD0,
98
- PAD_MAX,
99
-};
100
-
10196 struct regval {
10297 u8 addr;
10398 u8 val;
....@@ -606,9 +601,7 @@
606601 struct gc02m2 *gc02m2 = to_gc02m2(sd);
607602 const struct gc02m2_mode *mode = gc02m2->cur_mode;
608603
609
- mutex_lock(&gc02m2->mutex);
610604 fi->interval = mode->max_fps;
611
- mutex_unlock(&gc02m2->mutex);
612605
613606 return 0;
614607 }
....@@ -975,7 +968,7 @@
975968 }
976969 #endif
977970
978
-static int gc02m2_g_mbus_config(struct v4l2_subdev *sd,
971
+static int gc02m2_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
979972 struct v4l2_mbus_config *config)
980973 {
981974 struct gc02m2 *gc02m2 = to_gc02m2(sd);
....@@ -987,7 +980,7 @@
987980 V4L2_MBUS_CSI2_CHANNEL_0 |
988981 V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
989982
990
- config->type = V4L2_MBUS_CSI2;
983
+ config->type = V4L2_MBUS_CSI2_DPHY;
991984 config->flags = val;
992985 return 0;
993986 }
....@@ -1029,7 +1022,6 @@
10291022 static const struct v4l2_subdev_video_ops gc02m2_video_ops = {
10301023 .s_stream = gc02m2_s_stream,
10311024 .g_frame_interval = gc02m2_g_frame_interval,
1032
- .g_mbus_config = gc02m2_g_mbus_config,
10331025 };
10341026
10351027 static const struct v4l2_subdev_pad_ops gc02m2_pad_ops = {
....@@ -1038,6 +1030,7 @@
10381030 .enum_frame_interval = gc02m2_enum_frame_interval,
10391031 .get_fmt = gc02m2_get_fmt,
10401032 .set_fmt = gc02m2_set_fmt,
1033
+ .get_mbus_config = gc02m2_g_mbus_config,
10411034 };
10421035
10431036 static const struct v4l2_subdev_ops gc02m2_subdev_ops = {