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

Commit c70b18f7 authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] au8522: don't attempt to configure unsupported VBI slicer 



Since we don't suppoort sliced VBI with the au0828/au8522, there is
no need to configure the au8522 VBI slicer, which because of the
coefficients requires a large amount of i2c traffic.

Remove the relevant code.  Note that this has no effect on raw VBI
support, which is currently the only supported way to access VBI on
this device.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ac5c03b3

drivers/media/dvb-frontends/au8522_decoder.c

+0 −38
Original line number Diff line number Diff line
@@ -179,42 +179,6 @@ static inline struct au8522_state *to_state(struct v4l2_subdev *sd) 
	return container_of(sd, struct au8522_state, sd);

}



static void setup_vbi(struct au8522_state *state, int aud_input)

{

	int i;



	/* These are set to zero regardless of what mode we're in */

	au8522_writereg(state, AU8522_TVDEC_VBI_CTRL_H_REG017H, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_CTRL_L_REG018H, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_TOTAL_BITS_REG019H, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_TUNIT_H_REG01AH, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_TUNIT_L_REG01BH, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_THRESH1_REG01CH, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_FRAME_PAT2_REG01EH, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_FRAME_PAT1_REG01FH, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_FRAME_PAT0_REG020H, 0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_FRAME_MASK2_REG021H,

			0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_FRAME_MASK1_REG022H,

			0x00);

	au8522_writereg(state, AU8522_TVDEC_VBI_USER_FRAME_MASK0_REG023H,

			0x00);



	/* Setup the VBI registers */

	for (i = 0x30; i < 0x60; i++)

		au8522_writereg(state, i, 0x40);



	/* For some reason, every register is 0x40 except register 0x44

	   (confirmed via the HVR-950q USB capture) */

	au8522_writereg(state, 0x44, 0x60);



	/* Enable VBI (we always do this regardless of whether the user is

	   viewing closed caption info) */

	au8522_writereg(state, AU8522_TVDEC_VBI_CTRL_H_REG017H,

			AU8522_TVDEC_VBI_CTRL_H_REG017H_CCON);



}



static void setup_decoder_defaults(struct au8522_state *state, bool is_svideo)

{

	int i;
@@ -317,8 +281,6 @@ static void setup_decoder_defaults(struct au8522_state *state, bool is_svideo) 
			AU8522_TOREGAAGC_REG0E5H_CVBS);

	au8522_writereg(state, AU8522_REG016H, AU8522_REG016H_CVBS);



	setup_vbi(state, 0);



	if (is_svideo) {

		/* Despite what the table says, for the HVR-950q we still need

		   to be in CVBS mode for the S-Video input (reason unknown). */