1 files changed, 40 insertions, 18 deletions

diff --git a/linux/drivers/media/dvb/frontends/mt2060.c b/linux/drivers/media/dvb/frontends/mt2060.c
index 728bc2cd5..aa92c1c51 100644
--- a/linux/drivers/media/dvb/frontends/mt2060.c
+++ b/linux/drivers/media/dvb/frontends/mt2060.c
@@ -81,31 +81,29 @@ static int mt2060_writeregs(struct mt2060_state *state,u8 *buf, u8 len)
 	return 0;
 }
 
-// Initialization : VGAG=01, V1CSE=1
+// Initialisation sequences
+// LNABAND=3, NUM1=0x3C, DIV1=0x74, NUM2=0x1080, DIV2=0x49
 static u8 mt2060_config1[] = {
-	REG_VGAG,
-	0x31,	0xff
+	REG_LO1C1,
+	0x3F,	0x74,	0x00,	0x08,	0x93
 };
 
-// Initialization : FMCG=2, GP2=0, GP1=0
+// FMCG=2, GP2=0, GP1=0
 static u8 mt2060_config2[] = {
 	REG_MISC_CTRL,
-	0x20
+	0x20,	0x1E,	0x30,	0xff,	0x80,	0xff,	0x00,	0x2c,	0x42
 };
 
-// The power-up values are :
-// LNABAND=3, NUM1=0x3C, DIV1=0x74, NUM2=0x1080, DIV2=0x49 --> LO1=1.871GHz LO2=1.176250GHz
+//  VGAG=3, V1CSE=1
 static u8 mt2060_config3[] = {
-	REG_LO1C1,
-	0x3F,	0x74,	0x00,	0x08,	0x93
+	REG_VGAG,
+	0x33
 };
 
 int mt2060_init(struct mt2060_state *state)
 {
 	if (mt2060_writeregs(state,mt2060_config1,sizeof(mt2060_config1)))
 		return -EREMOTEIO;
-	if (mt2060_writeregs(state,mt2060_config2,sizeof(mt2060_config2)))
-		return -EREMOTEIO;
 	if (mt2060_writeregs(state,mt2060_config3,sizeof(mt2060_config3)))
 		return -EREMOTEIO;
 	return 0;
@@ -166,22 +164,28 @@ static int mt2060_spurcheck(u32 lo1,u32 lo2,u32 if2)
 }
 #endif
 
-#define IF1  (1220*1000) // IF1 frequency = 1.220 GHz
 #define IF2  36150       // IF2 frequency = 36.150 MHz
 #define FREF 16000       // Quartz oscillator 16 MHz
 
 int mt2060_set(struct mt2060_state *state, struct dvb_frontend_parameters *fep)
 {
 	int ret=0;
+	int i=0;
 	u32 freq;
 	u8  lnaband;
 	u32 f_lo1,f_lo2;
 	u32 div1,num1,div2,num2;
 	u8  b[8];
+	u32 if1;
+
+	if1 = state->if1_freq;
+	b[0] = REG_LO1B1;
+	b[1] = 0xFF;
+	mt2060_writeregs(state,b,2);
 
 	freq = fep->frequency / 1000; // Hz -> kHz
 
-	f_lo1 =  freq + IF1;
+	f_lo1 =  freq + if1 * 1000;
 	f_lo1 = (f_lo1/250)*250;
 	f_lo2 =  f_lo1 - freq - IF2;
 	f_lo2 = (f_lo2/50)*50;
@@ -218,11 +222,22 @@ int mt2060_set(struct mt2060_state *state, struct dvb_frontend_parameters *fep)
 	b[4] = num2 >> 4;
 	b[5] = ((num2 >>12) & 1) | (div2 << 1);
 
+	dprintk("IF1: %dMHz",(int)if1);
 	dprintk("PLL freq: %d  f_lo1: %d  f_lo2: %d  (kHz)",(int)freq,(int)f_lo1,(int)f_lo2);
 	dprintk("PLL div1: %d  num1: %d  div2: %d  num2: %d",(int)div1,(int)num1,(int)div2,(int)num2);
 	dprintk("PLL [1..5]: %2x %2x %2x %2x %2x",(int)b[1],(int)b[2],(int)b[3],(int)b[4],(int)b[5]);
 
 	mt2060_writeregs(state,b,6);
+
+	//Waits for pll lock or timeout
+	i=0;
+	do {
+		mt2060_readreg(state,REG_LO_STATUS,b);
+		if ((b[0] & 0x88)==0x88) break;
+		msleep(4);
+		i++;
+	} while (i<10);
+
 	return ret;
 }
 EXPORT_SYMBOL(mt2060_set);
@@ -232,28 +247,34 @@ static void mt2060_calibrate(struct mt2060_state *state)
 {
 	u8 b = 0;
 	int i = 0;
+
+	if (mt2060_writeregs(state,mt2060_config1,sizeof(mt2060_config1)))
+		return;
+	if (mt2060_writeregs(state,mt2060_config2,sizeof(mt2060_config2)))
+		return;
+
 	do {
 		b |= (1 << 6); // FM1SS;
 		mt2060_writereg(state, REG_LO2C1,b);
-		msleep(25);
+		msleep(20);
 
 		if (i == 0) {
 			b |= (1 << 7); // FM1CA;
 			mt2060_writereg(state, REG_LO2C1,b);
 			b &= ~(1 << 7); // FM1CA;
-			msleep(25);
+			msleep(20);
 		}
 
 		b &= ~(1 << 6); // FM1SS
 		mt2060_writereg(state, REG_LO2C1,b);
 
-		msleep(25);
+		msleep(20);
 		i++;
 	} while (i < 9);
 
 	i = 0;
 	while (i++ < 10 && mt2060_readreg(state, REG_MISC_STAT, &b) == 0 && (b & (1 << 6)) == 0)
-		msleep(25);
+		msleep(20);
 
 	if (i < 10) {
 		mt2060_readreg(state, REG_FM_FREQ, &state->fmfreq); // now find out, what is fmreq used for :)
@@ -263,13 +284,14 @@ static void mt2060_calibrate(struct mt2060_state *state)
 }
 
 /* This functions tries to identify a MT2060 tuner by reading the PART/REV register. This is hasty. */
-int mt2060_attach(struct mt2060_state *state, struct mt2060_config *config, struct i2c_adapter *i2c)
+int mt2060_attach(struct mt2060_state *state, struct mt2060_config *config, struct i2c_adapter *i2c,u16 if1)
 {
 	u8 id = 0;
 	memset(state,0,sizeof(struct mt2060_state));
 
 	state->config = config;
 	state->i2c = i2c;
+	state->if1_freq = if1;
 
 	if (mt2060_readreg(state,REG_PART_REV,&id) != 0)
 		return -ENODEV;