forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/media/i2c/imx347.c
....@@ -149,14 +149,6 @@
149149
150150 #define IMX347_NUM_SUPPLIES ARRAY_SIZE(imx347_supply_names)
151151
152
-enum imx347_max_pad {
153
- PAD0, /* link to isp */
154
- PAD1, /* link to csi wr0 | hdr x2:L x3:M */
155
- PAD2, /* link to csi wr1 | hdr x3:L */
156
- PAD3, /* link to csi wr2 | hdr x2:M x3:S */
157
- PAD_MAX,
158
-};
159
-
160152 struct regval {
161153 u16 addr;
162154 u8 val;
....@@ -1021,14 +1013,12 @@
10211013 struct imx347 *imx347 = to_imx347(sd);
10221014 const struct imx347_mode *mode = imx347->cur_mode;
10231015
1024
- mutex_lock(&imx347->mutex);
10251016 fi->interval = mode->max_fps;
1026
- mutex_unlock(&imx347->mutex);
10271017
10281018 return 0;
10291019 }
10301020
1031
-static int imx347_g_mbus_config(struct v4l2_subdev *sd,
1021
+static int imx347_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
10321022 struct v4l2_mbus_config *config)
10331023 {
10341024 struct imx347 *imx347 = to_imx347(sd);
....@@ -1051,7 +1041,7 @@
10511041 V4L2_MBUS_CSI2_CONTINUOUS_CLOCK |
10521042 V4L2_MBUS_CSI2_CHANNEL_1;
10531043
1054
- config->type = V4L2_MBUS_CSI2;
1044
+ config->type = V4L2_MBUS_CSI2_DPHY;
10551045 config->flags = val;
10561046
10571047 return 0;
....@@ -1811,7 +1801,6 @@
18111801 static const struct v4l2_subdev_video_ops imx347_video_ops = {
18121802 .s_stream = imx347_s_stream,
18131803 .g_frame_interval = imx347_g_frame_interval,
1814
- .g_mbus_config = imx347_g_mbus_config,
18151804 };
18161805
18171806 static const struct v4l2_subdev_pad_ops imx347_pad_ops = {
....@@ -1821,6 +1810,7 @@
18211810 .get_fmt = imx347_get_fmt,
18221811 .set_fmt = imx347_set_fmt,
18231812 .get_selection = imx347_get_selection,
1813
+ .get_mbus_config = imx347_g_mbus_config,
18241814 };
18251815
18261816 static const struct v4l2_subdev_ops imx347_subdev_ops = {