From: Hans Verkuil Date: Tue, 28 Jun 2016 14:30:35 +0000 (-0300) Subject: [media] adv7511: drop adv7511_set_IT_content_AVI_InfoFrame X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=afd620f81bb02762b77fb76f29a0287cbce32e8c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [media] adv7511: drop adv7511_set_IT_content_AVI_InfoFrame The IT Content bit has nothing to do with CE vs IT timings. Delete this code. This will also fix a bug where this could override the 'content type' control, which is actually the correct place to set/clear the ITC bit. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c index 39d409f99628..df507adb130a 100644 --- a/drivers/media/i2c/adv7511.c +++ b/drivers/media/i2c/adv7511.c @@ -382,18 +382,6 @@ static void adv7511_csc_rgb_full2limit(struct v4l2_subdev *sd, bool enable) } } -static void adv7511_set_IT_content_AVI_InfoFrame(struct v4l2_subdev *sd) -{ - struct adv7511_state *state = get_adv7511_state(sd); - if (state->dv_timings.bt.flags & V4L2_DV_FL_IS_CE_VIDEO) { - /* CE format, not IT */ - adv7511_wr_and_or(sd, 0x57, 0x7f, 0x00); - } else { - /* IT format */ - adv7511_wr_and_or(sd, 0x57, 0x7f, 0x80); - } -} - static int adv7511_set_rgb_quantization_mode(struct v4l2_subdev *sd, struct v4l2_ctrl *ctrl) { switch (ctrl->val) { @@ -1068,9 +1056,6 @@ static int adv7511_s_dv_timings(struct v4l2_subdev *sd, /* update quantization range based on new dv_timings */ adv7511_set_rgb_quantization_mode(sd, state->rgb_quantization_range_ctrl); - /* update AVI infoframe */ - adv7511_set_IT_content_AVI_InfoFrame(sd); - return 0; }