merge: http://linuxtv.org/hg/~mkrufky/tda18271

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 64 insertions, 105 deletions

diff --git a/linux/drivers/media/dvb/frontends/tda18271-fe.c b/linux/drivers/media/dvb/frontends/tda18271-fe.c
index 08990ddaa..579229f3d 100644
--- a/linux/drivers/media/dvb/frontends/tda18271-fe.c
+++ b/linux/drivers/media/dvb/frontends/tda18271-fe.c
@@ -26,13 +26,9 @@
 #include "tda18271.h"
 #include "tda18271-priv.h"
 
-static int tda18271_debug;
+int tda18271_debug;
 module_param_named(debug, tda18271_debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
-
-#define dprintk(level, fmt, arg...) do {\
-	if (tda18271_debug >= level) \
-		printk(KERN_DEBUG "%s: " fmt, __FUNCTION__, ##arg); } while (0)
+MODULE_PARM_DESC(debug, "set debug level (info=1, map=2, reg=4 (or-able))");
 
 /*---------------------------------------------------------------------*/
 
@@ -76,23 +72,23 @@ static void tda18271_dump_regs(struct dvb_frontend *fe)
 	struct tda18271_priv *priv = fe->tuner_priv;
 	unsigned char *regs = priv->tda18271_regs;
 
-	dprintk(1, "=== TDA18271 REG DUMP ===\n");
-	dprintk(1, "ID_BYTE            = 0x%x\n", 0xff & regs[R_ID]);
-	dprintk(1, "THERMO_BYTE        = 0x%x\n", 0xff & regs[R_TM]);
-	dprintk(1, "POWER_LEVEL_BYTE   = 0x%x\n", 0xff & regs[R_PL]);
-	dprintk(1, "EASY_PROG_BYTE_1   = 0x%x\n", 0xff & regs[R_EP1]);
-	dprintk(1, "EASY_PROG_BYTE_2   = 0x%x\n", 0xff & regs[R_EP2]);
-	dprintk(1, "EASY_PROG_BYTE_3   = 0x%x\n", 0xff & regs[R_EP3]);
-	dprintk(1, "EASY_PROG_BYTE_4   = 0x%x\n", 0xff & regs[R_EP4]);
-	dprintk(1, "EASY_PROG_BYTE_5   = 0x%x\n", 0xff & regs[R_EP5]);
-	dprintk(1, "CAL_POST_DIV_BYTE  = 0x%x\n", 0xff & regs[R_CPD]);
-	dprintk(1, "CAL_DIV_BYTE_1     = 0x%x\n", 0xff & regs[R_CD1]);
-	dprintk(1, "CAL_DIV_BYTE_2     = 0x%x\n", 0xff & regs[R_CD2]);
-	dprintk(1, "CAL_DIV_BYTE_3     = 0x%x\n", 0xff & regs[R_CD3]);
-	dprintk(1, "MAIN_POST_DIV_BYTE = 0x%x\n", 0xff & regs[R_MPD]);
-	dprintk(1, "MAIN_DIV_BYTE_1    = 0x%x\n", 0xff & regs[R_MD1]);
-	dprintk(1, "MAIN_DIV_BYTE_2    = 0x%x\n", 0xff & regs[R_MD2]);
-	dprintk(1, "MAIN_DIV_BYTE_3    = 0x%x\n", 0xff & regs[R_MD3]);
+	dbg_reg("=== TDA18271 REG DUMP ===\n");
+	dbg_reg("ID_BYTE            = 0x%02x\n", 0xff & regs[R_ID]);
+	dbg_reg("THERMO_BYTE        = 0x%02x\n", 0xff & regs[R_TM]);
+	dbg_reg("POWER_LEVEL_BYTE   = 0x%02x\n", 0xff & regs[R_PL]);
+	dbg_reg("EASY_PROG_BYTE_1   = 0x%02x\n", 0xff & regs[R_EP1]);
+	dbg_reg("EASY_PROG_BYTE_2   = 0x%02x\n", 0xff & regs[R_EP2]);
+	dbg_reg("EASY_PROG_BYTE_3   = 0x%02x\n", 0xff & regs[R_EP3]);
+	dbg_reg("EASY_PROG_BYTE_4   = 0x%02x\n", 0xff & regs[R_EP4]);
+	dbg_reg("EASY_PROG_BYTE_5   = 0x%02x\n", 0xff & regs[R_EP5]);
+	dbg_reg("CAL_POST_DIV_BYTE  = 0x%02x\n", 0xff & regs[R_CPD]);
+	dbg_reg("CAL_DIV_BYTE_1     = 0x%02x\n", 0xff & regs[R_CD1]);
+	dbg_reg("CAL_DIV_BYTE_2     = 0x%02x\n", 0xff & regs[R_CD2]);
+	dbg_reg("CAL_DIV_BYTE_3     = 0x%02x\n", 0xff & regs[R_CD3]);
+	dbg_reg("MAIN_POST_DIV_BYTE = 0x%02x\n", 0xff & regs[R_MPD]);
+	dbg_reg("MAIN_DIV_BYTE_1    = 0x%02x\n", 0xff & regs[R_MD1]);
+	dbg_reg("MAIN_DIV_BYTE_2    = 0x%02x\n", 0xff & regs[R_MD2]);
+	dbg_reg("MAIN_DIV_BYTE_3    = 0x%02x\n", 0xff & regs[R_MD3]);
 }
 
 static void tda18271_read_regs(struct dvb_frontend *fe)
@@ -119,7 +115,7 @@ static void tda18271_read_regs(struct dvb_frontend *fe)
 		printk("ERROR: %s: i2c_transfer returned: %d\n",
 		       __FUNCTION__, ret);
 
-	if (tda18271_debug > 2)
+	if (tda18271_debug & DBG_REG)
 		tda18271_dump_regs(fe);
 }
 
@@ -338,13 +334,10 @@ static int tda18271_init_regs(struct dvb_frontend *fe)
 	return 0;
 }
 
-static int tda18271_tune(struct dvb_frontend *fe,
-			 u32 ifc, u32 freq, u32 bw, u8 std)
+static int tda18271_init(struct dvb_frontend *fe)
 {
 	struct tda18271_priv *priv = fe->tuner_priv;
 	unsigned char *regs = priv->tda18271_regs;
-	u32 div, N = 0;
-	int i;
 
 	tda18271_read_regs(fe);
 
@@ -352,27 +345,33 @@ static int tda18271_tune(struct dvb_frontend *fe,
 	if ((regs[R_EP1] & 0x08) == 0)
 		tda18271_init_regs(fe);
 
+	return 0;
+}
+
+static int tda18271_tune(struct dvb_frontend *fe,
+			 u32 ifc, u32 freq, u32 bw, u8 std)
+{
+	struct tda18271_priv *priv = fe->tuner_priv;
+	unsigned char *regs = priv->tda18271_regs;
+	u32 div, N = 0;
+	u8 d, pd, val;
+
+	tda18271_init(fe);
 #if 0
 	/* FIXME: FM Radio support */
 	if (t->mode == V4L2_TUNER_RADIO)
 		freq = freq / 1000;
 #endif
 
-	dprintk(1, "freq = %d, ifc = %d\n", freq, ifc);
+	dbg_info("freq = %d, ifc = %d\n", freq, ifc);
 
 	/* RF tracking filter calibration */
 
 	/* calculate BP_Filter */
-	i = 0;
-	while ((tda18271_bp_filter[i].rfmax * 1000) < freq) {
-		if (tda18271_bp_filter[i + 1].rfmax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "bp filter = 0x%x, i = %d\n", tda18271_bp_filter[i].val, i);
+	tda18271_calc_bp_filter(&freq, &val);
 
 	regs[R_EP1]  &= ~0x07; /* clear bp filter bits */
-	regs[R_EP1]  |= tda18271_bp_filter[i].val;
+	regs[R_EP1]  |= val;
 	tda18271_write_regs(fe, R_EP1, 1);
 
 	regs[R_EB4]  &= 0x07;
@@ -402,18 +401,11 @@ static int tda18271_tune(struct dvb_frontend *fe,
 		break;
 	}
 
-	i = 0;
-	while ((tda18271_cal_pll[i].lomax * 1000) < N) {
-		if (tda18271_cal_pll[i + 1].lomax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "cal pll, pd = 0x%x, d = 0x%x, i = %d\n",
-		tda18271_cal_pll[i].pd, tda18271_cal_pll[i].d, i);
+	tda18271_calc_cal_pll(&N, &pd, &d);
 
-	regs[R_CPD]   = tda18271_cal_pll[i].pd;
+	regs[R_CPD]   = pd;
 
-	div =  ((tda18271_cal_pll[i].d * (N / 1000)) << 7) / 125;
+	div =  ((d * (N / 1000)) << 7) / 125;
 	regs[R_CD1]   = 0xff & (div >> 16);
 	regs[R_CD2]   = 0xff & (div >> 8);
 	regs[R_CD3]   = 0xff & div;
@@ -429,16 +421,9 @@ static int tda18271_tune(struct dvb_frontend *fe,
 		break;
 	}
 
-	i = 0;
-	while ((tda18271_main_pll[i].lomax * 1000) < N) {
-		if (tda18271_main_pll[i + 1].lomax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "main pll, pd = 0x%x, d = 0x%x, i = %d\n",
-		tda18271_main_pll[i].pd, tda18271_main_pll[i].d, i);
+	tda18271_calc_main_pll(&N, &pd, &d);
 
-	regs[R_MPD]   = (0x7f & tda18271_main_pll[i].pd);
+	regs[R_MPD]   = (0x7f & pd);
 
 	switch (priv->mode) {
 	case TDA18271_ANALOG:
@@ -449,7 +434,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
 		break;
 	}
 
-	div =  ((tda18271_main_pll[i].d * (N / 1000)) << 7) / 125;
+	div =  ((d * (N / 1000)) << 7) / 125;
 	regs[R_MD1]   = 0xff & (div >> 16);
 	regs[R_MD2]   = 0xff & (div >> 8);
 	regs[R_MD3]   = 0xff & div;
@@ -458,42 +443,23 @@ static int tda18271_tune(struct dvb_frontend *fe,
 	msleep(5); /* RF tracking filter calibration initialization */
 
 	/* search for K,M,CO for RF Calibration */
-	i = 0;
-	while ((tda18271_km[i].rfmax * 1000) < freq) {
-		if (tda18271_km[i + 1].rfmax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "km = 0x%x, i = %d\n", tda18271_km[i].val, i);
+	tda18271_calc_km(&freq, &val);
 
 	regs[R_EB13] &= 0x83;
-	regs[R_EB13] |= tda18271_km[i].val;
+	regs[R_EB13] |= val;
 	tda18271_write_regs(fe, R_EB13, 1);
 
 	/* search for RF_BAND */
-	i = 0;
-	while ((tda18271_rf_band[i].rfmax * 1000) < freq) {
-		if (tda18271_rf_band[i + 1].rfmax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "rf band = 0x%x, i = %d\n", tda18271_rf_band[i].val, i);
+	tda18271_calc_rf_band(&freq, &val);
 
 	regs[R_EP2]  &= ~0xe0; /* clear rf band bits */
-	regs[R_EP2]  |= (tda18271_rf_band[i].val << 5);
+	regs[R_EP2]  |= (val << 5);
 
 	/* search for Gain_Taper */
-	i = 0;
-	while ((tda18271_gain_taper[i].rfmax * 1000) < freq) {
-		if (tda18271_gain_taper[i + 1].rfmax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "gain taper = 0x%x, i = %d\n",
-		tda18271_gain_taper[i].val, i);
+	tda18271_calc_gain_taper(&freq, &val);
 
 	regs[R_EP2]  &= ~0x1f; /* clear gain taper bits */
-	regs[R_EP2]  |= tda18271_gain_taper[i].val;
+	regs[R_EP2]  |= val;
 
 	tda18271_write_regs(fe, R_EP2, 1);
 	tda18271_write_regs(fe, R_EP1, 1);
@@ -518,17 +484,11 @@ static int tda18271_tune(struct dvb_frontend *fe,
 	tda18271_write_regs(fe, R_EP1, 1);
 
 	/* RF tracking filer correction for VHF_Low band */
-	i = 0;
-	while ((tda18271_rf_cal[i].rfmax * 1000) < freq) {
-		if (tda18271_rf_cal[i].rfmax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "rf cal = 0x%x, i = %d\n", tda18271_rf_cal[i].val, i);
+	tda18271_calc_rf_cal(&freq, &val);
 
 	/* VHF_Low band only */
-	if (tda18271_rf_cal[i].rfmax != 0) {
-		regs[R_EB14]   = tda18271_rf_cal[i].val;
+	if (val != 0) {
+		regs[R_EB14] = val;
 		tda18271_write_regs(fe, R_EB14, 1);
 	}
 
@@ -567,21 +527,18 @@ static int tda18271_tune(struct dvb_frontend *fe,
 
 	regs[R_EP4]  &= ~0x80; /* turn this bit on only for fm */
 
-	/* FIXME: image rejection validity EP5[2:0] */
+	/* image rejection validity EP5[2:0] */
+	tda18271_calc_ir_measure(&freq, &val);
+
+	regs[R_EP5] &= ~0x07;
+	regs[R_EP5] |= val;
 
 	/* calculate MAIN PLL */
 	N = freq + ifc;
 
-	i = 0;
-	while ((tda18271_main_pll[i].lomax * 1000) < N) {
-		if (tda18271_main_pll[i + 1].lomax == 0)
-			break;
-		i++;
-	}
-	dprintk(2, "main pll, pd = 0x%x, d = 0x%x, i = %d\n",
-		tda18271_main_pll[i].pd, tda18271_main_pll[i].d, i);
+	tda18271_calc_main_pll(&N, &pd, &d);
 
-	regs[R_MPD]   = (0x7f & tda18271_main_pll[i].pd);
+	regs[R_MPD]   = (0x7f & pd);
 	switch (priv->mode) {
 	case TDA18271_ANALOG:
 		regs[R_MPD]  &= ~0x08;
@@ -591,7 +548,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
 		break;
 	}
 
-	div =  ((tda18271_main_pll[i].d * (N / 1000)) << 7) / 125;
+	div =  ((d * (N / 1000)) << 7) / 125;
 	regs[R_MD1]   = 0xff & (div >> 16);
 	regs[R_MD2]   = 0xff & (div >> 8);
 	regs[R_MD3]   = 0xff & div;
@@ -714,7 +671,7 @@ static int tda18271_set_analog_params(struct dvb_frontend *fe,
 	if (params->mode == V4L2_TUNER_RADIO)
 		sgIF =  88; /* if frequency is 5.5 MHz */
 
-	dprintk(1, "setting tda18271 to system %s\n", mode);
+	dbg_info("setting tda18271 to system %s\n", mode);
 
 	return tda18271_tune(fe, sgIF * 62500, params->frequency * 62500,
 			     0, std);
@@ -748,7 +705,7 @@ static struct dvb_tuner_ops tda18271_tuner_ops = {
 		.frequency_max  = 864000000,
 		.frequency_step =     62500
 	},
-	.init              = tda18271_init_regs,
+	.init              = tda18271_init,
 	.set_params        = tda18271_set_params,
 	.set_analog_params = tda18271_set_analog_params,
 	.release           = tda18271_release,
@@ -761,7 +718,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 {
 	struct tda18271_priv *priv = NULL;
 
-	dprintk(1, "@ %d-%04x\n", i2c_adapter_id(i2c), addr);
+	dbg_info("@ %d-%04x\n", i2c_adapter_id(i2c), addr);
 	priv = kzalloc(sizeof(struct tda18271_priv), GFP_KERNEL);
 	if (priv == NULL)
 		return NULL;
@@ -774,6 +731,8 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 
 	fe->tuner_priv = priv;
 
+	tda18271_init_regs(fe);
+
 	return fe;
 }
 EXPORT_SYMBOL_GPL(tda18271_attach);