MT2060: IF1 Offset from EEPROM, several updates

From: Patrick Boettcher <pb@linuxtv.org>


- AGC gain set to 3
- The tuning sequence has been changed to match the DibCom driver ( from I2C
  spy captures )
- For LITE-ON adapters : The IF1 frequency is now tuned according to the
  calibration values stored in EEPROM.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Olivier DANET <odanet@caramail.com>

4 files changed, 68 insertions, 27 deletions

diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c
index e079ba95d..88062b219 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -234,12 +234,31 @@ EXPORT_SYMBOL(dibusb_dib3000mc_frontend_attach);
 int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)
 {
 	int ret;
+	u8 a,b;
+	u16 if1=1220;
 
 	if (d->tuner_pass_ctrl) {
 		struct dibusb_state *st = d->priv;
 		d->tuner_pass_ctrl(d->fe, 1, stk3000p_mt2060_config.i2c_address);
-		/* check for mt2060 */
-		if ((ret = mt2060_attach(&st->mt2060,&stk3000p_mt2060_config, &d->i2c_adap)) != 0) {
+		// First IF calibration for Liteon Sticks
+		if (d->udev->descriptor.idVendor == USB_VID_LITEON &&
+		    d->udev->descriptor.idProduct == USB_PID_LITEON_DVB_T_WARM) {
+			dibusb_read_eeprom_byte(d,0x7E,&a);
+			dibusb_read_eeprom_byte(d,0x7F,&b);
+			if (a == 0xFF && b == 0xFF) {
+				if1 = 1220;
+			} else
+			if (a == 0x00) {
+				if1 = 1220+b;
+			} else
+			if (a == 0x80) {
+				if1 = 1220-b;
+			} else {
+				warn("LITE-ON DVB-T Tuner : Strange IF1 calibration :%2X %2X\n",(int)a,(int)b);
+				if1 = 1220;
+			}
+		}
+		if ((ret = mt2060_attach(&st->mt2060,&stk3000p_mt2060_config, &d->i2c_adap,if1)) != 0) {
 			/* not found - use panasonic pll parameters */
 			d->pll_addr = 0x60;
 			d->pll_desc = &dvb_pll_env57h1xd5;
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;
diff --git a/linux/drivers/media/dvb/frontends/mt2060.h b/linux/drivers/media/dvb/frontends/mt2060.h
index 9996fd668..d5dae102f 100644
--- a/linux/drivers/media/dvb/frontends/mt2060.h
+++ b/linux/drivers/media/dvb/frontends/mt2060.h
@@ -33,12 +33,12 @@ struct mt2060_config {
 struct mt2060_state {
 	struct mt2060_config *config;
 	struct i2c_adapter *i2c;
-
+	u16 if1_freq;
 	u8 fmfreq;
 };
 
 extern int mt2060_init(struct mt2060_state *state);
 extern int mt2060_set(struct mt2060_state *state, struct dvb_frontend_parameters *fep);
-extern int mt2060_attach(struct mt2060_state *state, struct mt2060_config *config, struct i2c_adapter *i2c);
+extern int mt2060_attach(struct mt2060_state *state, struct mt2060_config *config, struct i2c_adapter *i2c,u16 if1);
 
 #endif
diff --git a/linux/drivers/media/dvb/frontends/mt2060_priv.h b/linux/drivers/media/dvb/frontends/mt2060_priv.h
index b8a2e557e..47e691e44 100644
--- a/linux/drivers/media/dvb/frontends/mt2060_priv.h
+++ b/linux/drivers/media/dvb/frontends/mt2060_priv.h
@@ -55,14 +55,14 @@
        REV     : Revision code  : 3 for current revision
        LNABAND : Input frequency range : ( See code for details )
        NUM1 / DIV1 / NUM2 / DIV2 : Frequencies programming ( See code for details )
-       FM1CA  : Calibration Start Bit ( ? )
-       FM1SS  : Calibration Single Step bit ( ? )
-       L1LK   : LO1 Lock Detect ( ? )
+       FM1CA  : Calibration Start Bit
+       FM1SS  : Calibration Single Step bit
+       L1LK   : LO1 Lock Detect
        TAD1   : Tune Line ADC ( ? )
-       L2LK   : LO2 Lock Detect ( ? )
+       L2LK   : LO2 Lock Detect
        TAD2   : Tune Line ADC ( ? )
        FMF    : Estimated first IF Center frequency Offset ( ? )
-       FM1CAL : Calibration done bit ( ? )
+       FM1CAL : Calibration done bit
        TEMP   : On chip temperature sensor
        FMCG   : Mixer 1 Cap Gain ( ? )
        GP01 / GP02 : Programmable digital outputs. Unconnected pins ?