Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d7b06c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13668): tw9910: remove cropping 



Cropping is used for data input, and it is not needed now

Signed-off-by: default avatarKuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7874b903

drivers/media/video/tw9910.c

+0 −48
Original line number Diff line number Diff line
@@ -329,13 +329,6 @@ static const struct tw9910_scale_ctrl tw9910_pal_scales[] = { 
	},

};



static const struct tw9910_cropping_ctrl tw9910_cropping_ctrl = {

	.vdelay  = 0x0012,

	.vactive = 0x00F0,

	.hdelay  = 0x0010,

	.hactive = 0x02D0,

};



static const struct tw9910_hsync_ctrl tw9910_hsync_ctrl = {

	.start = 0x0260,

	.end   = 0x0300,
@@ -385,40 +378,6 @@ static int tw9910_set_scale(struct i2c_client *client, 
	return ret;

}



static int tw9910_set_cropping(struct i2c_client *client,

			       const struct tw9910_cropping_ctrl *cropping)

{

	int ret;



	ret = i2c_smbus_write_byte_data(client, CROP_HI,

					(cropping->vdelay  & 0x0300) >> 2 |

					(cropping->vactive & 0x0300) >> 4 |

					(cropping->hdelay  & 0x0300) >> 6 |

					(cropping->hactive & 0x0300) >> 8);

	if (ret < 0)

		return ret;



	ret = i2c_smbus_write_byte_data(client, VDELAY_LO,

					cropping->vdelay & 0x00FF);

	if (ret < 0)

		return ret;



	ret = i2c_smbus_write_byte_data(client, VACTIVE_LO,

					cropping->vactive & 0x00FF);

	if (ret < 0)

		return ret;



	ret = i2c_smbus_write_byte_data(client, HDELAY_LO,

					cropping->hdelay & 0x00FF);

	if (ret < 0)

		return ret;



	ret = i2c_smbus_write_byte_data(client, HACTIVE_LO,

					cropping->hactive & 0x00FF);



	return ret;

}



static int tw9910_set_hsync(struct i2c_client *client,

			    const struct tw9910_hsync_ctrl *hsync)

{
@@ -708,13 +667,6 @@ static int tw9910_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
	if (ret < 0)

		goto tw9910_set_fmt_error;



	/*

	 * set cropping

	 */

	ret = tw9910_set_cropping(client, &tw9910_cropping_ctrl);

	if (ret < 0)

		goto tw9910_set_fmt_error;



	/*

	 * set hsync

	 */