---

yaml --- r: 29892 b: refs/heads/master c: d1544ec h: refs/heads/master v: v3
git-mirror · Jun 25, 2006 · 1a75f03 · 1a75f03
1 parent 0bc0165
commit 1a75f03
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b800aae382bc3f79045ea544ad77bf03398d4443
+refs/heads/master: d1544ecb3b0589089ddb928affa7bd4255f9442e
diff --git a/trunk/drivers/media/dvb/frontends/mt352.c b/trunk/drivers/media/dvb/frontends/mt352.c
@@ -286,9 +286,12 @@ 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 (fe->ops->tuner_ops.pllbuf) {
+		fe->ops->tuner_ops.pllbuf(fe, param, buf+8, 5);
+		buf[8] <<= 1;
+		mt352_write(fe, buf, sizeof(buf));
+	}
 	if (state->config.no_tuner) {
 		/* start decoding */
 		mt352_write(fe, fsm_go, 2);

diff --git a/trunk/drivers/media/dvb/frontends/mt352.h b/trunk/drivers/media/dvb/frontends/mt352.h
@@ -49,12 +49,6 @@ struct mt352_config
 
 	/* Initialise the demodulator and PLL. Cannot be NULL */
 	int (*demod_init)(struct dvb_frontend* fe);
-
-	/* PLL setup - fill out the supplied 5 byte buffer with your PLL settings.
-	 * byte0: Set to pll i2c address (nonlinux; left shifted by 1)
-	 * byte1-4: PLL configuration.
-	 */
-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf);
 };
 
 extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,