.. | .. |
---|
101 | 101 | |
---|
102 | 102 | #define OS02G10_NUM_SUPPLIES ARRAY_SIZE(OS02G10_supply_names) |
---|
103 | 103 | |
---|
104 | | -enum os02g10_max_pad { |
---|
105 | | - PAD0, |
---|
106 | | - PAD1, |
---|
107 | | - PAD2, |
---|
108 | | - PAD3, |
---|
109 | | - PAD_MAX, |
---|
110 | | -}; |
---|
111 | | - |
---|
112 | 104 | struct regval { |
---|
113 | 105 | u8 addr; |
---|
114 | 106 | u8 val; |
---|
.. | .. |
---|
533 | 525 | struct os02g10 *os02g10 = to_os02g10(sd); |
---|
534 | 526 | const struct os02g10_mode *mode = os02g10->cur_mode; |
---|
535 | 527 | |
---|
536 | | - mutex_lock(&os02g10->mutex); |
---|
537 | 528 | fi->interval = mode->max_fps; |
---|
538 | | - mutex_unlock(&os02g10->mutex); |
---|
539 | 529 | |
---|
540 | 530 | return 0; |
---|
541 | 531 | } |
---|
542 | 532 | |
---|
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, |
---|
544 | 534 | struct v4l2_mbus_config *config) |
---|
545 | 535 | { |
---|
546 | 536 | struct os02g10 *os02g10 = to_os02g10(sd); |
---|
.. | .. |
---|
552 | 542 | V4L2_MBUS_CSI2_CHANNEL_0 | |
---|
553 | 543 | V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; |
---|
554 | 544 | |
---|
555 | | - config->type = V4L2_MBUS_CSI2; |
---|
| 545 | + config->type = V4L2_MBUS_CSI2_DPHY; |
---|
556 | 546 | config->flags = val; |
---|
557 | 547 | |
---|
558 | 548 | return 0; |
---|
.. | .. |
---|
942 | 932 | static const struct v4l2_subdev_video_ops os02g10_video_ops = { |
---|
943 | 933 | .s_stream = os02g10_s_stream, |
---|
944 | 934 | .g_frame_interval = os02g10_g_frame_interval, |
---|
945 | | - .g_mbus_config = os02g10_g_mbus_config, |
---|
946 | 935 | }; |
---|
947 | 936 | |
---|
948 | 937 | static const struct v4l2_subdev_pad_ops os02g10_pad_ops = { |
---|
.. | .. |
---|
951 | 940 | .enum_frame_interval = os02g10_enum_frame_interval, |
---|
952 | 941 | .get_fmt = os02g10_get_fmt, |
---|
953 | 942 | .set_fmt = os02g10_set_fmt, |
---|
| 943 | + .get_mbus_config = os02g10_g_mbus_config, |
---|
954 | 944 | }; |
---|
955 | 945 | |
---|
956 | 946 | static const struct v4l2_subdev_ops os02g10_subdev_ops = { |
---|