Commit ff29d06a authored by Oliver Endriss's avatar Oliver Endriss Committed by Linus Torvalds

[PATCH] dvb: stv0299: reduce i2c xfer and set register 0x12 from inittab

stv0299_set_frontend(): reduced number of i2c transfers, set register 0x12
from inittab
Signed-off-by: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 163d8fed
...@@ -561,8 +561,6 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par ...@@ -561,8 +561,6 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate); stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
stv0299_writeregI(state, 0x22, 0x00); stv0299_writeregI(state, 0x22, 0x00);
stv0299_writeregI(state, 0x23, 0x00); stv0299_writeregI(state, 0x23, 0x00);
stv0299_readreg (state, 0x23);
stv0299_writeregI(state, 0x12, 0xb9);
state->tuner_frequency = p->frequency; state->tuner_frequency = p->frequency;
state->fec_inner = p->u.qpsk.fec_inner; state->fec_inner = p->u.qpsk.fec_inner;
......
...@@ -1566,7 +1566,7 @@ static u8 alps_bsru6_inittab[] = { ...@@ -1566,7 +1566,7 @@ static u8 alps_bsru6_inittab[] = {
0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
0x10, 0x3f, // AGC2 0x3d 0x10, 0x3f, // AGC2 0x3d
0x11, 0x84, 0x11, 0x84,
0x12, 0xb5, // Lock detect: -64 Carrier freq detect:on 0x12, 0xb9,
0x15, 0xc9, // lock detector threshold 0x15, 0xc9, // lock detector threshold
0x16, 0x00, 0x16, 0x00,
0x17, 0x00, 0x17, 0x00,
...@@ -1668,7 +1668,7 @@ static u8 alps_bsbe1_inittab[] = { ...@@ -1668,7 +1668,7 @@ static u8 alps_bsbe1_inittab[] = {
0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
0x10, 0x3f, // AGC2 0x3d 0x10, 0x3f, // AGC2 0x3d
0x11, 0x84, 0x11, 0x84,
0x12, 0xb5, // Lock detect: -64 Carrier freq detect:on 0x12, 0xb9,
0x15, 0xc9, // lock detector threshold 0x15, 0xc9, // lock detector threshold
0x16, 0x00, 0x16, 0x00,
0x17, 0x00, 0x17, 0x00,
......
...@@ -499,7 +499,7 @@ static u8 typhoon_cinergy1200s_inittab[] = { ...@@ -499,7 +499,7 @@ static u8 typhoon_cinergy1200s_inittab[] = {
0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
0x10, 0x3f, // AGC2 0x3d 0x10, 0x3f, // AGC2 0x3d
0x11, 0x84, 0x11, 0x84,
0x12, 0xb5, // Lock detect: -64 Carrier freq detect:on 0x12, 0xb9,
0x15, 0xc9, // lock detector threshold 0x15, 0xc9, // lock detector threshold
0x16, 0x00, 0x16, 0x00,
0x17, 0x00, 0x17, 0x00,
......
...@@ -490,7 +490,7 @@ static u8 alps_bsru6_inittab[] = { ...@@ -490,7 +490,7 @@ static u8 alps_bsru6_inittab[] = {
0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
0x10, 0x3f, // AGC2 0x3d 0x10, 0x3f, // AGC2 0x3d
0x11, 0x84, 0x11, 0x84,
0x12, 0xb5, // Lock detect: -64 Carrier freq detect:on 0x12, 0xb9,
0x15, 0xc9, // lock detector threshold 0x15, 0xc9, // lock detector threshold
0x16, 0x00, 0x16, 0x00,
0x17, 0x00, 0x17, 0x00,
......
...@@ -305,7 +305,7 @@ static u8 alps_bsru6_inittab[] = { ...@@ -305,7 +305,7 @@ static u8 alps_bsru6_inittab[] = {
0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
0x10, 0x3f, // AGC2 0x3d 0x10, 0x3f, // AGC2 0x3d
0x11, 0x84, 0x11, 0x84,
0x12, 0xb5, // Lock detect: -64 Carrier freq detect:on 0x12, 0xb9,
0x15, 0xc9, // lock detector threshold 0x15, 0xc9, // lock detector threshold
0x16, 0x00, 0x16, 0x00,
0x17, 0x00, 0x17, 0x00,
......
...@@ -286,7 +286,7 @@ static u8 alps_bsru6_inittab[] = { ...@@ -286,7 +286,7 @@ static u8 alps_bsru6_inittab[] = {
0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
0x10, 0x3f, // AGC2 0x3d 0x10, 0x3f, // AGC2 0x3d
0x11, 0x84, 0x11, 0x84,
0x12, 0xb5, // Lock detect: -64 Carrier freq detect:on 0x12, 0xb9,
0x15, 0xc9, // lock detector threshold 0x15, 0xc9, // lock detector threshold
0x16, 0x00, 0x16, 0x00,
0x17, 0x00, 0x17, 0x00,
...@@ -383,7 +383,7 @@ static u8 alps_bsbe1_inittab[] = { ...@@ -383,7 +383,7 @@ static u8 alps_bsbe1_inittab[] = {
0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
0x10, 0x3f, // AGC2 0x3d 0x10, 0x3f, // AGC2 0x3d
0x11, 0x84, 0x11, 0x84,
0x12, 0xb5, // Lock detect: -64 Carrier freq detect:on 0x12, 0xb9,
0x15, 0xc9, // lock detector threshold 0x15, 0xc9, // lock detector threshold
0x16, 0x00, 0x16, 0x00,
0x17, 0x00, 0x17, 0x00,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment