|
@@ -80,6 +80,7 @@ struct ov5645_mode_info {
|
|
|
u32 height;
|
|
|
const struct reg_value *data;
|
|
|
u32 data_size;
|
|
|
+ u32 pixel_clock;
|
|
|
};
|
|
|
|
|
|
struct ov5645 {
|
|
@@ -99,6 +100,7 @@ struct ov5645 {
|
|
|
const struct ov5645_mode_info *current_mode;
|
|
|
|
|
|
struct v4l2_ctrl_handler ctrls;
|
|
|
+ struct v4l2_ctrl *pixel_clock;
|
|
|
|
|
|
/* Cached register values */
|
|
|
u8 aec_pk_manual;
|
|
@@ -510,19 +512,22 @@ static const struct ov5645_mode_info ov5645_mode_info_data[] = {
|
|
|
.width = 1280,
|
|
|
.height = 960,
|
|
|
.data = ov5645_setting_sxga,
|
|
|
- .data_size = ARRAY_SIZE(ov5645_setting_sxga)
|
|
|
+ .data_size = ARRAY_SIZE(ov5645_setting_sxga),
|
|
|
+ .pixel_clock = 111440000
|
|
|
},
|
|
|
{
|
|
|
.width = 1920,
|
|
|
.height = 1080,
|
|
|
.data = ov5645_setting_1080p,
|
|
|
- .data_size = ARRAY_SIZE(ov5645_setting_1080p)
|
|
|
+ .data_size = ARRAY_SIZE(ov5645_setting_1080p),
|
|
|
+ .pixel_clock = 167160000
|
|
|
},
|
|
|
{
|
|
|
.width = 2592,
|
|
|
.height = 1944,
|
|
|
.data = ov5645_setting_full,
|
|
|
- .data_size = ARRAY_SIZE(ov5645_setting_full)
|
|
|
+ .data_size = ARRAY_SIZE(ov5645_setting_full),
|
|
|
+ .pixel_clock = 167160000
|
|
|
},
|
|
|
};
|
|
|
|
|
@@ -969,6 +974,7 @@ static int ov5645_set_format(struct v4l2_subdev *sd,
|
|
|
struct v4l2_mbus_framefmt *__format;
|
|
|
struct v4l2_rect *__crop;
|
|
|
const struct ov5645_mode_info *new_mode;
|
|
|
+ int ret;
|
|
|
|
|
|
__crop = __ov5645_get_pad_crop(ov5645, cfg, format->pad,
|
|
|
format->which);
|
|
@@ -978,8 +984,14 @@ static int ov5645_set_format(struct v4l2_subdev *sd,
|
|
|
__crop->width = new_mode->width;
|
|
|
__crop->height = new_mode->height;
|
|
|
|
|
|
- if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
|
|
|
+ if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
|
|
|
+ ret = v4l2_ctrl_s_ctrl_int64(ov5645->pixel_clock,
|
|
|
+ new_mode->pixel_clock);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
+
|
|
|
ov5645->current_mode = new_mode;
|
|
|
+ }
|
|
|
|
|
|
__format = __ov5645_get_pad_format(ov5645, cfg, format->pad,
|
|
|
format->which);
|
|
@@ -1197,7 +1209,7 @@ static int ov5645_probe(struct i2c_client *client,
|
|
|
|
|
|
mutex_init(&ov5645->power_lock);
|
|
|
|
|
|
- v4l2_ctrl_handler_init(&ov5645->ctrls, 7);
|
|
|
+ v4l2_ctrl_handler_init(&ov5645->ctrls, 8);
|
|
|
v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
|
V4L2_CID_SATURATION, -4, 4, 1, 0);
|
|
|
v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
|
|
@@ -1215,6 +1227,10 @@ static int ov5645_probe(struct i2c_client *client,
|
|
|
V4L2_CID_TEST_PATTERN,
|
|
|
ARRAY_SIZE(ov5645_test_pattern_menu) - 1,
|
|
|
0, 0, ov5645_test_pattern_menu);
|
|
|
+ ov5645->pixel_clock = v4l2_ctrl_new_std(&ov5645->ctrls,
|
|
|
+ &ov5645_ctrl_ops,
|
|
|
+ V4L2_CID_PIXEL_RATE,
|
|
|
+ 1, INT_MAX, 1, 1);
|
|
|
|
|
|
ov5645->sd.ctrl_handler = &ov5645->ctrls;
|
|
|
|