Skip to content

L
linux-davinci-2.6.23
Commit 3528cc4e authored by Andrew de Quincy's avatar Andrew de Quincy Committed by Linus Torvalds
Browse files
Options

[PATCH] dvb: Remove broken stv0299 enhanced tuning code 

Remove broken stv0299 enhanced tuning code
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 83b75b04
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 57 deletions
drivers/media/dvb/b2c2/flexcop-fe-tuner.c
View file @ 3528cc4e
...@@ -234,7 +234,6 @@ static struct stv0299_config samsung_tbmu24112_config = { ...@@ -234,7 +234,6 @@ static struct stv0299_config samsung_tbmu24112_config = {
.inittab = samsung_tbmu24112_inittab, .inittab = samsung_tbmu24112_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 0, .invert = 0,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_LK, .lock_output = STV0229_LOCKOUTPUT_LK,
.volt13_op0_op1 = STV0299_VOLT13_OP1, .volt13_op0_op1 = STV0299_VOLT13_OP1,
......
drivers/media/dvb/frontends/stv0299.c
View file @ 3528cc4e
...@@ -553,49 +553,16 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par ...@@ -553,49 +553,16 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
if (state->config->invert) invval = (~invval) & 1; if (state->config->invert) invval = (~invval) & 1;
stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval); stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval);
if (state->config->enhanced_tuning) { stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */
/* check if we should do a finetune */ state->config->pll_set(fe, state->i2c, p);
int frequency_delta = p->frequency - state->tuner_frequency; stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */
int minmax = p->u.qpsk.symbol_rate / 2000;
if (minmax < 5000) minmax = 5000; stv0299_set_FEC (state, p->u.qpsk.fec_inner);
stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
if ((frequency_delta > -minmax) && (frequency_delta < minmax) && (frequency_delta != 0) && stv0299_writeregI(state, 0x22, 0x00);
(state->fec_inner == p->u.qpsk.fec_inner) && stv0299_writeregI(state, 0x23, 0x00);
(state->symbol_rate == p->u.qpsk.symbol_rate)) { stv0299_readreg (state, 0x23);
int Drot_freq = (frequency_delta << 16) / (state->config->mclk / 1000); stv0299_writeregI(state, 0x12, 0xb9);
// zap the derotator registers first
stv0299_writeregI(state, 0x22, 0x00);
stv0299_writeregI(state, 0x23, 0x00);
// now set them as we want
stv0299_writeregI(state, 0x22, Drot_freq >> 8);
stv0299_writeregI(state, 0x23, Drot_freq);
} else {
/* A "normal" tune is requested */
stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */
state->config->pll_set(fe, state->i2c, p);
stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */
stv0299_writeregI(state, 0x32, 0x80);
stv0299_writeregI(state, 0x22, 0x00);
stv0299_writeregI(state, 0x23, 0x00);
stv0299_writeregI(state, 0x32, 0x19);
stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
stv0299_set_FEC (state, p->u.qpsk.fec_inner);
}
} else {
stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */
state->config->pll_set(fe, state->i2c, p);
stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */
stv0299_set_FEC (state, p->u.qpsk.fec_inner);
stv0299_set_symbolrate (fe, p->u.qpsk.symbol_rate);
stv0299_writeregI(state, 0x22, 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;
......
drivers/media/dvb/frontends/stv0299.h
View file @ 3528cc4e
...@@ -73,9 +73,6 @@ struct stv0299_config ...@@ -73,9 +73,6 @@ struct stv0299_config
/* does the inversion require inversion? */ /* does the inversion require inversion? */
u8 invert:1; u8 invert:1;
/* Should the enhanced tuning code be used? */
u8 enhanced_tuning:1;
/* Skip reinitialisation? */ /* Skip reinitialisation? */
u8 skip_reinit:1; u8 skip_reinit:1;
......
drivers/media/dvb/ttpci/av7110.c
View file @ 3528cc4e
...@@ -1644,7 +1644,6 @@ static struct stv0299_config alps_bsru6_config = { ...@@ -1644,7 +1644,6 @@ static struct stv0299_config alps_bsru6_config = {
.inittab = alps_bsru6_inittab, .inittab = alps_bsru6_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 1, .invert = 1,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_1, .lock_output = STV0229_LOCKOUTPUT_1,
.volt13_op0_op1 = STV0299_VOLT13_OP1, .volt13_op0_op1 = STV0299_VOLT13_OP1,
...@@ -1721,7 +1720,6 @@ static struct stv0299_config alps_bsbe1_config = { ...@@ -1721,7 +1720,6 @@ static struct stv0299_config alps_bsbe1_config = {
.inittab = alps_bsbe1_inittab, .inittab = alps_bsbe1_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 1, .invert = 1,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.min_delay_ms = 100, .min_delay_ms = 100,
.set_symbol_rate = alps_bsru6_set_symbol_rate, .set_symbol_rate = alps_bsru6_set_symbol_rate,
......
drivers/media/dvb/ttpci/budget-av.c
View file @ 3528cc4e
...@@ -531,7 +531,6 @@ static struct stv0299_config typhoon_config = { ...@@ -531,7 +531,6 @@ static struct stv0299_config typhoon_config = {
.inittab = typhoon_cinergy1200s_inittab, .inittab = typhoon_cinergy1200s_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 0, .invert = 0,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_1, .lock_output = STV0229_LOCKOUTPUT_1,
.volt13_op0_op1 = STV0299_VOLT13_OP0, .volt13_op0_op1 = STV0299_VOLT13_OP0,
...@@ -546,7 +545,6 @@ static struct stv0299_config cinergy_1200s_config = { ...@@ -546,7 +545,6 @@ static struct stv0299_config cinergy_1200s_config = {
.inittab = typhoon_cinergy1200s_inittab, .inittab = typhoon_cinergy1200s_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 0, .invert = 0,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_0, .lock_output = STV0229_LOCKOUTPUT_0,
.volt13_op0_op1 = STV0299_VOLT13_OP0, .volt13_op0_op1 = STV0299_VOLT13_OP0,
......
drivers/media/dvb/ttpci/budget-ci.c
View file @ 3528cc4e
...@@ -580,7 +580,6 @@ static struct stv0299_config alps_bsru6_config = { ...@@ -580,7 +580,6 @@ static struct stv0299_config alps_bsru6_config = {
.inittab = alps_bsru6_inittab, .inittab = alps_bsru6_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 1, .invert = 1,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_1, .lock_output = STV0229_LOCKOUTPUT_1,
.volt13_op0_op1 = STV0299_VOLT13_OP1, .volt13_op0_op1 = STV0299_VOLT13_OP1,
...@@ -710,7 +709,6 @@ static struct stv0299_config philips_su1278_tt_config = { ...@@ -710,7 +709,6 @@ static struct stv0299_config philips_su1278_tt_config = {
.inittab = philips_su1278_tt_inittab, .inittab = philips_su1278_tt_inittab,
.mclk = 64000000UL, .mclk = 64000000UL,
.invert = 0, .invert = 0,
.enhanced_tuning = 1,
.skip_reinit = 1, .skip_reinit = 1,
.lock_output = STV0229_LOCKOUTPUT_1, .lock_output = STV0229_LOCKOUTPUT_1,
.volt13_op0_op1 = STV0299_VOLT13_OP1, .volt13_op0_op1 = STV0299_VOLT13_OP1,
......
drivers/media/dvb/ttpci/budget-patch.c
View file @ 3528cc4e
...@@ -379,7 +379,6 @@ static struct stv0299_config alps_bsru6_config = { ...@@ -379,7 +379,6 @@ static struct stv0299_config alps_bsru6_config = {
.inittab = alps_bsru6_inittab, .inittab = alps_bsru6_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 1, .invert = 1,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_1, .lock_output = STV0229_LOCKOUTPUT_1,
.volt13_op0_op1 = STV0299_VOLT13_OP1, .volt13_op0_op1 = STV0299_VOLT13_OP1,
......
drivers/media/dvb/ttpci/budget.c
View file @ 3528cc4e
...@@ -360,7 +360,6 @@ static struct stv0299_config alps_bsru6_config = { ...@@ -360,7 +360,6 @@ static struct stv0299_config alps_bsru6_config = {
.inittab = alps_bsru6_inittab, .inittab = alps_bsru6_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 1, .invert = 1,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_1, .lock_output = STV0229_LOCKOUTPUT_1,
.volt13_op0_op1 = STV0299_VOLT13_OP1, .volt13_op0_op1 = STV0299_VOLT13_OP1,
...@@ -436,7 +435,6 @@ static struct stv0299_config alps_bsbe1_config = { ...@@ -436,7 +435,6 @@ static struct stv0299_config alps_bsbe1_config = {
.inittab = alps_bsbe1_inittab, .inittab = alps_bsbe1_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 1, .invert = 1,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.min_delay_ms = 100, .min_delay_ms = 100,
.set_symbol_rate = alps_bsru6_set_symbol_rate, .set_symbol_rate = alps_bsru6_set_symbol_rate,
......
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
View file @ 3528cc4e
...@@ -1335,7 +1335,6 @@ static struct stv0299_config alps_stv0299_config = { ...@@ -1335,7 +1335,6 @@ static struct stv0299_config alps_stv0299_config = {
.inittab = alps_bsru6_inittab, .inittab = alps_bsru6_inittab,
.mclk = 88000000UL, .mclk = 88000000UL,
.invert = 1, .invert = 1,
.enhanced_tuning = 0,
.skip_reinit = 0, .skip_reinit = 0,
.lock_output = STV0229_LOCKOUTPUT_1, .lock_output = STV0229_LOCKOUTPUT_1,
.volt13_op0_op1 = STV0299_VOLT13_OP1, .volt13_op0_op1 = STV0299_VOLT13_OP1,
......
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