Commit 32536108 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13644): v4l: add new v4l2-subdev sensor operations, use g_skip_top_lines in soc-camera 



Introduce new v4l2-subdev sensor operations, move .enum_framesizes() and
.enum_frameintervals() methods to it, add a new .g_skip_top_lines() method
and switch soc-camera to use it instead of .y_skip_top soc_camera_device
member, which can now be removed.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Reviewed-by: default avatarSergio Aguirre <saaguirre@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 11e3d1ad

drivers/media/video/mt9m001.c

+23 −7
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ struct mt9m001 { 
	int model;	/* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */

	unsigned int gain;

	unsigned int exposure;

	unsigned short y_skip_top;	/* Lines to skip at the top */

	unsigned char autoexposure;

};
@@ -222,7 +223,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
	soc_camera_limit_side(&rect.top, &rect.height,

		     MT9M001_ROW_SKIP, MT9M001_MIN_HEIGHT, MT9M001_MAX_HEIGHT);



	total_h = rect.height + icd->y_skip_top + vblank;

	total_h = rect.height + mt9m001->y_skip_top + vblank;



	/* Blanking and start values - default... */

	ret = reg_write(client, MT9M001_HORIZONTAL_BLANKING, hblank);
@@ -239,7 +240,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
		ret = reg_write(client, MT9M001_WINDOW_WIDTH, rect.width - 1);

	if (!ret)

		ret = reg_write(client, MT9M001_WINDOW_HEIGHT,

				rect.height + icd->y_skip_top - 1);

				rect.height + mt9m001->y_skip_top - 1);

	if (!ret && mt9m001->autoexposure) {

		ret = reg_write(client, MT9M001_SHUTTER_WIDTH, total_h);

		if (!ret) {
@@ -327,13 +328,13 @@ static int mt9m001_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) 
static int mt9m001_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)

{

	struct i2c_client *client = sd->priv;

	struct soc_camera_device *icd = client->dev.platform_data;

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct v4l2_pix_format *pix = &f->fmt.pix;



	v4l_bound_align_image(&pix->width, MT9M001_MIN_WIDTH,

		MT9M001_MAX_WIDTH, 1,

		&pix->height, MT9M001_MIN_HEIGHT + icd->y_skip_top,

		MT9M001_MAX_HEIGHT + icd->y_skip_top, 0, 0);

		&pix->height, MT9M001_MIN_HEIGHT + mt9m001->y_skip_top,

		MT9M001_MAX_HEIGHT + mt9m001->y_skip_top, 0, 0);



	if (pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||

	    pix->pixelformat == V4L2_PIX_FMT_SBGGR16)
@@ -552,7 +553,7 @@ static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 
		if (ctrl->value) {

			const u16 vblank = 25;

			unsigned int total_h = mt9m001->rect.height +

				icd->y_skip_top + vblank;

				mt9m001->y_skip_top + vblank;

			if (reg_write(client, MT9M001_SHUTTER_WIDTH,

				      total_h) < 0)

				return -EIO;
@@ -655,6 +656,16 @@ static void mt9m001_video_remove(struct soc_camera_device *icd) 
		icl->free_bus(icl);

}



static int mt9m001_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)

{

	struct i2c_client *client = sd->priv;

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	*lines = mt9m001->y_skip_top;



	return 0;

}



static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {

	.g_ctrl		= mt9m001_g_ctrl,

	.s_ctrl		= mt9m001_s_ctrl,
@@ -675,9 +686,14 @@ static struct v4l2_subdev_video_ops mt9m001_subdev_video_ops = { 
	.cropcap	= mt9m001_cropcap,

};



static struct v4l2_subdev_sensor_ops mt9m001_subdev_sensor_ops = {

	.g_skip_top_lines	= mt9m001_g_skip_top_lines,

};



static struct v4l2_subdev_ops mt9m001_subdev_ops = {

	.core	= &mt9m001_subdev_core_ops,

	.video	= &mt9m001_subdev_video_ops,

	.sensor	= &mt9m001_subdev_sensor_ops,

};



static int mt9m001_probe(struct i2c_client *client,
@@ -714,8 +730,8 @@ static int mt9m001_probe(struct i2c_client *client, 


	/* Second stage probe - when a capture adapter is there */

	icd->ops		= &mt9m001_ops;

	icd->y_skip_top		= 0;



	mt9m001->y_skip_top	= 0;

	mt9m001->rect.left	= MT9M001_COLUMN_SKIP;

	mt9m001->rect.top	= MT9M001_ROW_SKIP;

	mt9m001->rect.width	= MT9M001_MAX_WIDTH;

drivers/media/video/mt9m111.c

+0 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,6 @@ static int mt9m111_probe(struct i2c_client *client, 


	/* Second stage probe - when a capture adapter is there */

	icd->ops		= &mt9m111_ops;

	icd->y_skip_top		= 0;



	mt9m111->rect.left	= MT9M111_MIN_DARK_COLS;

	mt9m111->rect.top	= MT9M111_MIN_DARK_ROWS;

drivers/media/video/mt9t031.c

+20 −4
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct mt9t031 { 
	u16 xskip;

	u16 yskip;

	unsigned int gain;

	unsigned short y_skip_top;	/* Lines to skip at the top */

	unsigned int exposure;

	unsigned char autoexposure;

};
@@ -301,9 +302,9 @@ static int mt9t031_set_params(struct soc_camera_device *icd, 
		ret = reg_write(client, MT9T031_WINDOW_WIDTH, rect->width - 1);

	if (ret >= 0)

		ret = reg_write(client, MT9T031_WINDOW_HEIGHT,

				rect->height + icd->y_skip_top - 1);

				rect->height + mt9t031->y_skip_top - 1);

	if (ret >= 0 && mt9t031->autoexposure) {

		unsigned int total_h = rect->height + icd->y_skip_top + vblank;

		unsigned int total_h = rect->height + mt9t031->y_skip_top + vblank;

		ret = set_shutter(client, total_h);

		if (ret >= 0) {

			const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;
@@ -657,7 +658,7 @@ static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 
			const u16 vblank = MT9T031_VERTICAL_BLANK;

			const u32 shutter_max = MT9T031_MAX_HEIGHT + vblank;

			unsigned int total_h = mt9t031->rect.height +

				icd->y_skip_top + vblank;

				mt9t031->y_skip_top + vblank;



			if (set_shutter(client, total_h) < 0)

				return -EIO;
@@ -714,6 +715,16 @@ static int mt9t031_video_probe(struct i2c_client *client) 
	return ret;

}



static int mt9t031_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)

{

	struct i2c_client *client = sd->priv;

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	*lines = mt9t031->y_skip_top;



	return 0;

}



static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {

	.g_ctrl		= mt9t031_g_ctrl,

	.s_ctrl		= mt9t031_s_ctrl,
@@ -734,9 +745,14 @@ static struct v4l2_subdev_video_ops mt9t031_subdev_video_ops = { 
	.cropcap	= mt9t031_cropcap,

};



static struct v4l2_subdev_sensor_ops mt9t031_subdev_sensor_ops = {

	.g_skip_top_lines	= mt9t031_g_skip_top_lines,

};



static struct v4l2_subdev_ops mt9t031_subdev_ops = {

	.core	= &mt9t031_subdev_core_ops,

	.video	= &mt9t031_subdev_video_ops,

	.sensor	= &mt9t031_subdev_sensor_ops,

};



static int mt9t031_probe(struct i2c_client *client,
@@ -773,8 +789,8 @@ static int mt9t031_probe(struct i2c_client *client, 


	/* Second stage probe - when a capture adapter is there */

	icd->ops		= &mt9t031_ops;

	icd->y_skip_top		= 0;



	mt9t031->y_skip_top	= 0;

	mt9t031->rect.left	= MT9T031_COLUMN_SKIP;

	mt9t031->rect.top	= MT9T031_ROW_SKIP;

	mt9t031->rect.width	= MT9T031_MAX_WIDTH;

drivers/media/video/mt9v022.c

+23 −9
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ struct mt9v022 { 
	__u32 fourcc;

	int model;	/* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */

	u16 chip_control;

	unsigned short y_skip_top;	/* Lines to skip at the top */

};



static struct mt9v022 *to_mt9v022(const struct i2c_client *client)
@@ -265,7 +266,6 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
	struct i2c_client *client = sd->priv;

	struct mt9v022 *mt9v022 = to_mt9v022(client);

	struct v4l2_rect rect = a->c;

	struct soc_camera_device *icd = client->dev.platform_data;

	int ret;



	/* Bayer format - even size lengths */
@@ -287,10 +287,10 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
	if (ret >= 0) {

		if (ret & 1) /* Autoexposure */

			ret = reg_write(client, MT9V022_MAX_TOTAL_SHUTTER_WIDTH,

					rect.height + icd->y_skip_top + 43);

					rect.height + mt9v022->y_skip_top + 43);

		else

			ret = reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH,

					rect.height + icd->y_skip_top + 43);

					rect.height + mt9v022->y_skip_top + 43);

	}

	/* Setup frame format: defaults apart from width and height */

	if (!ret)
@@ -309,7 +309,7 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
		ret = reg_write(client, MT9V022_WINDOW_WIDTH, rect.width);

	if (!ret)

		ret = reg_write(client, MT9V022_WINDOW_HEIGHT,

				rect.height + icd->y_skip_top);

				rect.height + mt9v022->y_skip_top);



	if (ret < 0)

		return ret;
@@ -410,15 +410,15 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f) 
static int mt9v022_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)

{

	struct i2c_client *client = sd->priv;

	struct soc_camera_device *icd = client->dev.platform_data;

	struct mt9v022 *mt9v022 = to_mt9v022(client);

	struct v4l2_pix_format *pix = &f->fmt.pix;

	int align = pix->pixelformat == V4L2_PIX_FMT_SBGGR8 ||

		pix->pixelformat == V4L2_PIX_FMT_SBGGR16;



	v4l_bound_align_image(&pix->width, MT9V022_MIN_WIDTH,

		MT9V022_MAX_WIDTH, align,

		&pix->height, MT9V022_MIN_HEIGHT + icd->y_skip_top,

		MT9V022_MAX_HEIGHT + icd->y_skip_top, align, 0);

		&pix->height, MT9V022_MIN_HEIGHT + mt9v022->y_skip_top,

		MT9V022_MAX_HEIGHT + mt9v022->y_skip_top, align, 0);



	return 0;

}
@@ -787,6 +787,16 @@ static void mt9v022_video_remove(struct soc_camera_device *icd) 
		icl->free_bus(icl);

}



static int mt9v022_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)

{

	struct i2c_client *client = sd->priv;

	struct mt9v022 *mt9v022 = to_mt9v022(client);



	*lines = mt9v022->y_skip_top;



	return 0;

}



static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {

	.g_ctrl		= mt9v022_g_ctrl,

	.s_ctrl		= mt9v022_s_ctrl,
@@ -807,9 +817,14 @@ static struct v4l2_subdev_video_ops mt9v022_subdev_video_ops = { 
	.cropcap	= mt9v022_cropcap,

};



static struct v4l2_subdev_sensor_ops mt9v022_subdev_sensor_ops = {

	.g_skip_top_lines	= mt9v022_g_skip_top_lines,

};



static struct v4l2_subdev_ops mt9v022_subdev_ops = {

	.core	= &mt9v022_subdev_core_ops,

	.video	= &mt9v022_subdev_video_ops,

	.sensor	= &mt9v022_subdev_sensor_ops,

};



static int mt9v022_probe(struct i2c_client *client,
@@ -851,8 +866,7 @@ static int mt9v022_probe(struct i2c_client *client, 
	 * MT9V022 _really_ corrupts the first read out line.

	 * TODO: verify on i.MX31

	 */

	icd->y_skip_top		= 1;



	mt9v022->y_skip_top	= 1;

	mt9v022->rect.left	= MT9V022_COLUMN_SKIP;

	mt9v022->rect.top	= MT9V022_ROW_SKIP;

	mt9v022->rect.width	= MT9V022_MAX_WIDTH;

drivers/media/video/pxa_camera.c

+7 −2
Original line number Diff line number Diff line
@@ -1051,8 +1051,13 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd, 
{

	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);

	struct pxa_camera_dev *pcdev = ici->priv;

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	unsigned long dw, bpp;

	u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0;

	u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0, y_skip_top;

	int ret = v4l2_subdev_call(sd, sensor, g_skip_top_lines, &y_skip_top);



	if (ret < 0)

		y_skip_top = 0;



	/* Datawidth is now guaranteed to be equal to one of the three values.

	 * We fix bit-per-pixel equal to data-width... */
@@ -1118,7 +1123,7 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd, 


	cicr2 = 0;

	cicr3 = CICR3_LPF_VAL(icd->user_height - 1) |

		CICR3_BFW_VAL(min((unsigned short)255, icd->y_skip_top));

		CICR3_BFW_VAL(min((u32)255, y_skip_top));

	cicr4 |= pcdev->mclk_divisor;



	__raw_writel(cicr1, pcdev->base + CICR1);