hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/media/i2c/ov02k10.c
....@@ -116,14 +116,6 @@
116116
117117 #define OV02K10_NUM_SUPPLIES ARRAY_SIZE(ov02k10_supply_names)
118118
119
-enum ov02k10_max_pad {
120
- PAD0,
121
- PAD1,
122
- PAD2,
123
- PAD3,
124
- PAD_MAX,
125
-};
126
-
127119 struct regval {
128120 u16 addr;
129121 u8 val;
....@@ -837,14 +829,12 @@
837829 struct ov02k10 *ov02k10 = to_ov02k10(sd);
838830 const struct ov02k10_mode *mode = ov02k10->cur_mode;
839831
840
- mutex_lock(&ov02k10->mutex);
841832 fi->interval = mode->max_fps;
842
- mutex_unlock(&ov02k10->mutex);
843833
844834 return 0;
845835 }
846836
847
-static int ov02k10_g_mbus_config(struct v4l2_subdev *sd,
837
+static int ov02k10_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
848838 struct v4l2_mbus_config *config)
849839 {
850840 struct ov02k10 *ov02k10 = to_ov02k10(sd);
....@@ -861,7 +851,7 @@
861851 V4L2_MBUS_CSI2_CONTINUOUS_CLOCK |
862852 V4L2_MBUS_CSI2_CHANNEL_1;
863853
864
- config->type = V4L2_MBUS_CSI2;
854
+ config->type = V4L2_MBUS_CSI2_DPHY;
865855 config->flags = val;
866856
867857 return 0;
....@@ -1573,7 +1563,6 @@
15731563 static const struct v4l2_subdev_video_ops ov02k10_video_ops = {
15741564 .s_stream = ov02k10_s_stream,
15751565 .g_frame_interval = ov02k10_g_frame_interval,
1576
- .g_mbus_config = ov02k10_g_mbus_config,
15771566 };
15781567
15791568 static const struct v4l2_subdev_pad_ops ov02k10_pad_ops = {
....@@ -1583,6 +1572,7 @@
15831572 .get_fmt = ov02k10_get_fmt,
15841573 .set_fmt = ov02k10_set_fmt,
15851574 .get_selection = ov02k10_get_selection,
1575
+ .get_mbus_config = ov02k10_g_mbus_config,
15861576 };
15871577
15881578 static const struct v4l2_subdev_ops ov02k10_subdev_ops = {