update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/i2c/ov02k10.c
..
..
@@ -116,14 +116,6 @@
116
116
 
117
117
 #define OV02K10_NUM_SUPPLIES ARRAY_SIZE(ov02k10_supply_names)
118
118
 
119
-enum ov02k10_max_pad {
120
-	PAD0,
121
-	PAD1,
122
-	PAD2,
123
-	PAD3,
124
-	PAD_MAX,
125
-};
126
-
127
119
 struct regval {
128
120
 	u16 addr;
129
121
 	u8 val;
..
..
@@ -837,14 +829,12 @@
837
829
 	struct ov02k10 *ov02k10 = to_ov02k10(sd);
838
830
 	const struct ov02k10_mode *mode = ov02k10->cur_mode;
839
831
 
840
-	mutex_lock(&ov02k10->mutex);
841
832
 	fi->interval = mode->max_fps;
842
-	mutex_unlock(&ov02k10->mutex);
843
833
 
844
834
 	return 0;
845
835
 }
846
836
 
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,
848
838
 				 struct v4l2_mbus_config *config)
849
839
 {
850
840
 	struct ov02k10 *ov02k10 = to_ov02k10(sd);
..
..
@@ -861,7 +851,7 @@
861
851
 		V4L2_MBUS_CSI2_CONTINUOUS_CLOCK |
862
852
 		V4L2_MBUS_CSI2_CHANNEL_1;
863
853
 
864
-	config->type = V4L2_MBUS_CSI2;
854
+	config->type = V4L2_MBUS_CSI2_DPHY;
865
855
 	config->flags = val;
866
856
 
867
857
 	return 0;
..
..
@@ -1573,7 +1563,6 @@
1573
1563
 static const struct v4l2_subdev_video_ops ov02k10_video_ops = {
1574
1564
 	.s_stream = ov02k10_s_stream,
1575
1565
 	.g_frame_interval = ov02k10_g_frame_interval,
1576
-	.g_mbus_config = ov02k10_g_mbus_config,
1577
1566
 };
1578
1567
 
1579
1568
 static const struct v4l2_subdev_pad_ops ov02k10_pad_ops = {
..
..
@@ -1583,6 +1572,7 @@
1583
1572
 	.get_fmt = ov02k10_get_fmt,
1584
1573
 	.set_fmt = ov02k10_set_fmt,
1585
1574
 	.get_selection = ov02k10_get_selection,
1575
+	.get_mbus_config = ov02k10_g_mbus_config,
1586
1576
 };
1587
1577
 
1588
1578
 static const struct v4l2_subdev_ops ov02k10_subdev_ops = {