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

Commit 3528cc4e authored by Andrew de Quincy's avatar Andrew de Quincy Committed by Linus Torvalds
Browse files

[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

drivers/media/dvb/b2c2/flexcop-fe-tuner.c

+0 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ static struct stv0299_config samsung_tbmu24112_config = { 
	.inittab = samsung_tbmu24112_inittab,

	.mclk = 88000000UL,

	.invert = 0,

	.enhanced_tuning = 0,

	.skip_reinit = 0,

	.lock_output = STV0229_LOCKOUTPUT_LK,

	.volt13_op0_op1 = STV0299_VOLT13_OP1,

drivers/media/dvb/frontends/stv0299.c

+10 −43
Original line number Diff line number Diff line
@@ -553,38 +553,6 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par 
	if (state->config->invert) invval = (~invval) & 1;

	stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval);



	if (state->config->enhanced_tuning) {

		/* check if we should do a finetune */

		int frequency_delta = p->frequency - state->tuner_frequency;

		int minmax = p->u.qpsk.symbol_rate / 2000;

		if (minmax < 5000) minmax = 5000;



		if ((frequency_delta > -minmax) && (frequency_delta < minmax) && (frequency_delta != 0) &&

		    (state->fec_inner == p->u.qpsk.fec_inner) &&

		    (state->symbol_rate == p->u.qpsk.symbol_rate)) {

			int Drot_freq = (frequency_delta << 16) / (state->config->mclk / 1000);



			// 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  */
@@ -595,7 +563,6 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par 
	stv0299_writeregI(state, 0x23, 0x00);

	stv0299_readreg (state, 0x23);

	stv0299_writeregI(state, 0x12, 0xb9);

	}



	state->tuner_frequency = p->frequency;

	state->fec_inner = p->u.qpsk.fec_inner;

drivers/media/dvb/frontends/stv0299.h

+0 −3
Original line number Diff line number Diff line
@@ -73,9 +73,6 @@ struct stv0299_config 
	/* does the inversion require inversion? */

	u8 invert:1;



	/* Should the enhanced tuning code be used? */

	u8 enhanced_tuning:1;



	/* Skip reinitialisation? */

	u8 skip_reinit:1;

drivers/media/dvb/ttpci/av7110.c

+0 −2
Original line number Diff line number Diff line
@@ -1644,7 +1644,6 @@ static struct stv0299_config alps_bsru6_config = { 
	.inittab = alps_bsru6_inittab,

	.mclk = 88000000UL,

	.invert = 1,

	.enhanced_tuning = 0,

	.skip_reinit = 0,

	.lock_output = STV0229_LOCKOUTPUT_1,

	.volt13_op0_op1 = STV0299_VOLT13_OP1,
@@ -1721,7 +1720,6 @@ static struct stv0299_config alps_bsbe1_config = { 
	.inittab = alps_bsbe1_inittab,

	.mclk = 88000000UL,

	.invert = 1,

	.enhanced_tuning = 0,

	.skip_reinit = 0,

	.min_delay_ms = 100,

	.set_symbol_rate = alps_bsru6_set_symbol_rate,

drivers/media/dvb/ttpci/budget-av.c

+0 −2
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ static struct stv0299_config typhoon_config = { 
	.inittab = typhoon_cinergy1200s_inittab,

	.mclk = 88000000UL,

	.invert = 0,

	.enhanced_tuning = 0,

	.skip_reinit = 0,

	.lock_output = STV0229_LOCKOUTPUT_1,

	.volt13_op0_op1 = STV0299_VOLT13_OP0,
@@ -546,7 +545,6 @@ static struct stv0299_config cinergy_1200s_config = { 
	.inittab = typhoon_cinergy1200s_inittab,

	.mclk = 88000000UL,

	.invert = 0,

	.enhanced_tuning = 0,

	.skip_reinit = 0,

	.lock_output = STV0229_LOCKOUTPUT_0,

	.volt13_op0_op1 = STV0299_VOLT13_OP0,