hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/i2c/os02g10.c
....@@ -101,14 +101,6 @@
101101
102102 #define OS02G10_NUM_SUPPLIES ARRAY_SIZE(OS02G10_supply_names)
103103
104
-enum os02g10_max_pad {
105
- PAD0,
106
- PAD1,
107
- PAD2,
108
- PAD3,
109
- PAD_MAX,
110
-};
111
-
112104 struct regval {
113105 u8 addr;
114106 u8 val;
....@@ -533,14 +525,12 @@
533525 struct os02g10 *os02g10 = to_os02g10(sd);
534526 const struct os02g10_mode *mode = os02g10->cur_mode;
535527
536
- mutex_lock(&os02g10->mutex);
537528 fi->interval = mode->max_fps;
538
- mutex_unlock(&os02g10->mutex);
539529
540530 return 0;
541531 }
542532
543
-static int os02g10_g_mbus_config(struct v4l2_subdev *sd,
533
+static int os02g10_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad,
544534 struct v4l2_mbus_config *config)
545535 {
546536 struct os02g10 *os02g10 = to_os02g10(sd);
....@@ -552,7 +542,7 @@
552542 V4L2_MBUS_CSI2_CHANNEL_0 |
553543 V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
554544
555
- config->type = V4L2_MBUS_CSI2;
545
+ config->type = V4L2_MBUS_CSI2_DPHY;
556546 config->flags = val;
557547
558548 return 0;
....@@ -942,7 +932,6 @@
942932 static const struct v4l2_subdev_video_ops os02g10_video_ops = {
943933 .s_stream = os02g10_s_stream,
944934 .g_frame_interval = os02g10_g_frame_interval,
945
- .g_mbus_config = os02g10_g_mbus_config,
946935 };
947936
948937 static const struct v4l2_subdev_pad_ops os02g10_pad_ops = {
....@@ -951,6 +940,7 @@
951940 .enum_frame_interval = os02g10_enum_frame_interval,
952941 .get_fmt = os02g10_get_fmt,
953942 .set_fmt = os02g10_set_fmt,
943
+ .get_mbus_config = os02g10_g_mbus_config,
954944 };
955945
956946 static const struct v4l2_subdev_ops os02g10_subdev_ops = {