Commit 9293aafe authored by Daniel Scally's avatar Daniel Scally Committed by Mauro Carvalho Chehab
Browse files

media: i2c: Add vblank control to ov8865 



Add a V4L2_CID_VBLANK control to the ov8865 driver.

Signed-off-by: default avatarDaniel Scally <djrscally@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d938b2f2

drivers/media/i2c/ov8865.c

+32 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 
#define OV8865_VTS_H(v)				(((v) & GENMASK(11, 8)) >> 8)

#define OV8865_VTS_L_REG			0x380f

#define OV8865_VTS_L(v)				((v) & GENMASK(7, 0))

#define OV8865_TIMING_MAX_VTS			0xffff

#define OV8865_TIMING_MIN_VTS			0x04

#define OV8865_OFFSET_X_H_REG			0x3810

#define OV8865_OFFSET_X_H(v)			(((v) & GENMASK(15, 8)) >> 8)

#define OV8865_OFFSET_X_L_REG			0x3811
@@ -675,6 +677,7 @@ struct ov8865_state { 
struct ov8865_ctrls {

	struct v4l2_ctrl *link_freq;

	struct v4l2_ctrl *pixel_rate;

	struct v4l2_ctrl *vblank;



	struct v4l2_ctrl_handler handler;

};
@@ -2225,6 +2228,20 @@ static int ov8865_test_pattern_configure(struct ov8865_sensor *sensor, 
			    ov8865_test_pattern_bits[index]);

}



/* Blanking */



static int ov8865_vts_configure(struct ov8865_sensor *sensor, u32 vblank)

{

	u16 vts = sensor->state.mode->output_size_y + vblank;

	int ret;



	ret = ov8865_write(sensor, OV8865_VTS_H_REG, OV8865_VTS_H(vts));

	if (ret)

		return ret;



	return ov8865_write(sensor, OV8865_VTS_L_REG, OV8865_VTS_L(vts));

}



/* State */



static int ov8865_state_mipi_configure(struct ov8865_sensor *sensor,
@@ -2476,6 +2493,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_TEST_PATTERN:

		index = (unsigned int)ctrl->val;

		return ov8865_test_pattern_configure(sensor, index);

	case V4L2_CID_VBLANK:

		return ov8865_vts_configure(sensor, ctrl->val);

	default:

		return -EINVAL;

	}
@@ -2492,6 +2511,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) 
	struct ov8865_ctrls *ctrls = &sensor->ctrls;

	struct v4l2_ctrl_handler *handler = &ctrls->handler;

	const struct v4l2_ctrl_ops *ops = &ov8865_ctrl_ops;

	const struct ov8865_mode *mode = &ov8865_modes[0];

	unsigned int vblank_max, vblank_def;

	int ret;



	v4l2_ctrl_handler_init(handler, 32);
@@ -2528,6 +2549,13 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) 
				     ARRAY_SIZE(ov8865_test_pattern_menu) - 1,

				     0, 0, ov8865_test_pattern_menu);



	/* Blanking */

	vblank_max = OV8865_TIMING_MAX_VTS - mode->output_size_y;

	vblank_def = mode->vts - mode->output_size_y;

	ctrls->vblank = v4l2_ctrl_new_std(handler, ops, V4L2_CID_VBLANK,

					  OV8865_TIMING_MIN_VTS, vblank_max, 1,

					  vblank_def);



	/* MIPI CSI-2 */



	ctrls->link_freq =
@@ -2708,6 +2736,10 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, 
		 sensor->state.mbus_code != mbus_code)

		ret = ov8865_state_configure(sensor, mode, mbus_code);



	__v4l2_ctrl_modify_range(sensor->ctrls.vblank, OV8865_TIMING_MIN_VTS,

				 OV8865_TIMING_MAX_VTS - mode->output_size_y,

				 1, mode->vts - mode->output_size_y);



complete:

	mutex_unlock(&sensor->mutex);