merge: from master

From: Ricardo Cerqueira <v4l@cerqueira.org>

merging master changes

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>

1 files changed, 22 insertions, 5 deletions

diff --git a/linux/drivers/media/dvb/frontends/mt352.c b/linux/drivers/media/dvb/frontends/mt352.c
index aaaec909d..ed3bede02 100644
--- a/linux/drivers/media/dvb/frontends/mt352.c
+++ b/linux/drivers/media/dvb/frontends/mt352.c
@@ -286,16 +286,33 @@ static int mt352_set_parameters(struct dvb_frontend* fe,
 
 	mt352_calc_nominal_rate(state, op->bandwidth, buf+4);
 	mt352_calc_input_freq(state, buf+6);
-	state->config.pll_set(fe, param, buf+8);
 
-	mt352_write(fe, buf, sizeof(buf));
+	// if there is no secondary tuner, call set_params to set up a potential
+	// tuner attached elsewhere
 	if (state->config.no_tuner) {
-		/* start decoding */
+		if (fe->ops->tuner_ops.set_params) {
+			fe->ops->tuner_ops.set_params(fe, param);
+			if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+		}
+
+		/* start decoding only */
 		mt352_write(fe, fsm_go, 2);
-	} else {
-		/* start tuning */
+	}
+
+	// retrieve the pllbuf - we do this even if there is no
+	// secondary tuner simply so we have a record of what was sent for
+	// debugging.
+	if (fe->ops->tuner_ops.calc_regs) {
+		fe->ops->tuner_ops.calc_regs(fe, param, buf+8, 5);
+		buf[8] <<= 1;
+		mt352_write(fe, buf, sizeof(buf));
+	}
+
+	// send PLL and start tuning and then decoding
+	if (!state->config.no_tuner) {
 		mt352_write(fe, tuner_go, 2);
 	}
+
 	return 0;
 }