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

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

[media] au8522: remove leading bit for register writes 



The leading bit in register values is actually an indicator as to
whether to perform a read or write, so remove the bit from the
register values, since the au8522_writereg() is now responsible
for adding this bit automatically.

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 678de4b4

drivers/media/dvb-frontends/au8522_dig.c

+100 −100
Original line number Diff line number Diff line
@@ -271,9 +271,9 @@ static int au8522_set_if(struct dvb_frontend *fe, enum au8522_if_freq if_freq) 
		return -EINVAL;

	}

	dprintk("%s() %s MHz\n", __func__, ifmhz);

	au8522_writereg(state, 0x80b5, r0b5);

	au8522_writereg(state, 0x80b6, r0b6);

	au8522_writereg(state, 0x80b7, r0b7);

	au8522_writereg(state, 0x00b5, r0b5);

	au8522_writereg(state, 0x00b6, r0b6);

	au8522_writereg(state, 0x00b7, r0b7);



	return 0;

}
@@ -283,33 +283,33 @@ static struct { 
	u16 reg;

	u16 data;

} VSB_mod_tab[] = {

	{ 0x8090, 0x84 },

	{ 0x0090, 0x84 },

	{ 0x4092, 0x11 },

	{ 0x2005, 0x00 },

	{ 0x8091, 0x80 },

	{ 0x80a3, 0x0c },

	{ 0x80a4, 0xe8 },

	{ 0x8081, 0xc4 },

	{ 0x80a5, 0x40 },

	{ 0x80a7, 0x40 },

	{ 0x80a6, 0x67 },

	{ 0x8262, 0x20 },

	{ 0x821c, 0x30 },

	{ 0x80d8, 0x1a },

	{ 0x8227, 0xa0 },

	{ 0x8121, 0xff },

	{ 0x80a8, 0xf0 },

	{ 0x80a9, 0x05 },

	{ 0x80aa, 0x77 },

	{ 0x80ab, 0xf0 },

	{ 0x80ac, 0x05 },

	{ 0x80ad, 0x77 },

	{ 0x80ae, 0x41 },

	{ 0x80af, 0x66 },

	{ 0x821b, 0xcc },

	{ 0x821d, 0x80 },

	{ 0x80a4, 0xe8 },

	{ 0x8231, 0x13 },

	{ 0x0091, 0x80 },

	{ 0x00a3, 0x0c },

	{ 0x00a4, 0xe8 },

	{ 0x0081, 0xc4 },

	{ 0x00a5, 0x40 },

	{ 0x00a7, 0x40 },

	{ 0x00a6, 0x67 },

	{ 0x0262, 0x20 },

	{ 0x021c, 0x30 },

	{ 0x00d8, 0x1a },

	{ 0x0227, 0xa0 },

	{ 0x0121, 0xff },

	{ 0x00a8, 0xf0 },

	{ 0x00a9, 0x05 },

	{ 0x00aa, 0x77 },

	{ 0x00ab, 0xf0 },

	{ 0x00ac, 0x05 },

	{ 0x00ad, 0x77 },

	{ 0x00ae, 0x41 },

	{ 0x00af, 0x66 },

	{ 0x021b, 0xcc },

	{ 0x021d, 0x80 },

	{ 0x00a4, 0xe8 },

	{ 0x0231, 0x13 },

};



/* QAM64 Modulation table */
@@ -396,78 +396,78 @@ static struct { 
	u16 reg;

	u16 data;

} QAM256_mod_tab[] = {

	{ 0x80a3, 0x09 },

	{ 0x80a4, 0x00 },

	{ 0x8081, 0xc4 },

	{ 0x80a5, 0x40 },

	{ 0x80aa, 0x77 },

	{ 0x80ad, 0x77 },

	{ 0x80a6, 0x67 },

	{ 0x8262, 0x20 },

	{ 0x821c, 0x30 },

	{ 0x80b8, 0x3e },

	{ 0x80b9, 0xf0 },

	{ 0x80ba, 0x01 },

	{ 0x80bb, 0x18 },

	{ 0x80bc, 0x50 },

	{ 0x80bd, 0x00 },

	{ 0x80be, 0xea },

	{ 0x80bf, 0xef },

	{ 0x80c0, 0xfc },

	{ 0x80c1, 0xbd },

	{ 0x80c2, 0x1f },

	{ 0x80c3, 0xfc },

	{ 0x80c4, 0xdd },

	{ 0x80c5, 0xaf },

	{ 0x80c6, 0x00 },

	{ 0x80c7, 0x38 },

	{ 0x80c8, 0x30 },

	{ 0x80c9, 0x05 },

	{ 0x80ca, 0x4a },

	{ 0x80cb, 0xd0 },

	{ 0x80cc, 0x01 },

	{ 0x80cd, 0xd9 },

	{ 0x80ce, 0x6f },

	{ 0x80cf, 0xf9 },

	{ 0x80d0, 0x70 },

	{ 0x80d1, 0xdf },

	{ 0x80d2, 0xf7 },

	{ 0x80d3, 0xc2 },

	{ 0x80d4, 0xdf },

	{ 0x80d5, 0x02 },

	{ 0x80d6, 0x9a },

	{ 0x80d7, 0xd0 },

	{ 0x8250, 0x0d },

	{ 0x8251, 0xcd },

	{ 0x8252, 0xe0 },

	{ 0x8253, 0x05 },

	{ 0x8254, 0xa7 },

	{ 0x8255, 0xff },

	{ 0x8256, 0xed },

	{ 0x8257, 0x5b },

	{ 0x8258, 0xae },

	{ 0x8259, 0xe6 },

	{ 0x825a, 0x3d },

	{ 0x825b, 0x0f },

	{ 0x825c, 0x0d },

	{ 0x825d, 0xea },

	{ 0x825e, 0xf2 },

	{ 0x825f, 0x51 },

	{ 0x8260, 0xf5 },

	{ 0x8261, 0x06 },

	{ 0x821a, 0x00 },

	{ 0x8546, 0x40 },

	{ 0x8210, 0x26 },

	{ 0x8211, 0xf6 },

	{ 0x8212, 0x84 },

	{ 0x8213, 0x02 },

	{ 0x8502, 0x01 },

	{ 0x8121, 0x04 },

	{ 0x8122, 0x04 },

	{ 0x852e, 0x10 },

	{ 0x80a4, 0xca },

	{ 0x80a7, 0x40 },

	{ 0x8526, 0x01 },

	{ 0x00a3, 0x09 },

	{ 0x00a4, 0x00 },

	{ 0x0081, 0xc4 },

	{ 0x00a5, 0x40 },

	{ 0x00aa, 0x77 },

	{ 0x00ad, 0x77 },

	{ 0x00a6, 0x67 },

	{ 0x0262, 0x20 },

	{ 0x021c, 0x30 },

	{ 0x00b8, 0x3e },

	{ 0x00b9, 0xf0 },

	{ 0x00ba, 0x01 },

	{ 0x00bb, 0x18 },

	{ 0x00bc, 0x50 },

	{ 0x00bd, 0x00 },

	{ 0x00be, 0xea },

	{ 0x00bf, 0xef },

	{ 0x00c0, 0xfc },

	{ 0x00c1, 0xbd },

	{ 0x00c2, 0x1f },

	{ 0x00c3, 0xfc },

	{ 0x00c4, 0xdd },

	{ 0x00c5, 0xaf },

	{ 0x00c6, 0x00 },

	{ 0x00c7, 0x38 },

	{ 0x00c8, 0x30 },

	{ 0x00c9, 0x05 },

	{ 0x00ca, 0x4a },

	{ 0x00cb, 0xd0 },

	{ 0x00cc, 0x01 },

	{ 0x00cd, 0xd9 },

	{ 0x00ce, 0x6f },

	{ 0x00cf, 0xf9 },

	{ 0x00d0, 0x70 },

	{ 0x00d1, 0xdf },

	{ 0x00d2, 0xf7 },

	{ 0x00d3, 0xc2 },

	{ 0x00d4, 0xdf },

	{ 0x00d5, 0x02 },

	{ 0x00d6, 0x9a },

	{ 0x00d7, 0xd0 },

	{ 0x0250, 0x0d },

	{ 0x0251, 0xcd },

	{ 0x0252, 0xe0 },

	{ 0x0253, 0x05 },

	{ 0x0254, 0xa7 },

	{ 0x0255, 0xff },

	{ 0x0256, 0xed },

	{ 0x0257, 0x5b },

	{ 0x0258, 0xae },

	{ 0x0259, 0xe6 },

	{ 0x025a, 0x3d },

	{ 0x025b, 0x0f },

	{ 0x025c, 0x0d },

	{ 0x025d, 0xea },

	{ 0x025e, 0xf2 },

	{ 0x025f, 0x51 },

	{ 0x0260, 0xf5 },

	{ 0x0261, 0x06 },

	{ 0x021a, 0x00 },

	{ 0x0546, 0x40 },

	{ 0x0210, 0x26 },

	{ 0x0211, 0xf6 },

	{ 0x0212, 0x84 },

	{ 0x0213, 0x02 },

	{ 0x0502, 0x01 },

	{ 0x0121, 0x04 },

	{ 0x0122, 0x04 },

	{ 0x052e, 0x10 },

	{ 0x00a4, 0xca },

	{ 0x00a7, 0x40 },

	{ 0x0526, 0x01 },

};



static struct {