X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Ftuner-simple.c;h=be8d903171b7dce5f3ace750c63177a86d107284;hb=2e561c7b7e705b619122e5386d6f99f28f2b6e5a;hp=b95ed1f489a033c78afc07fc40a149f1d676d732;hpb=a2a7f84b7908c6dba998b43a1ed343aff1d2fd98;p=linux-2.6

diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index b95ed1f489..be8d903171 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -17,10 +17,22 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
+#define TUNER_SIMPLE_MAX 64
+static unsigned int simple_devcount;
+
 static int offset;
 module_param(offset, int, 0664);
 MODULE_PARM_DESC(offset, "Allows to specify an offset for tuner");
 
+static unsigned int atv_input[TUNER_SIMPLE_MAX] = \
+			{ [0 ... (TUNER_SIMPLE_MAX-1)] = 0 };
+static unsigned int dtv_input[TUNER_SIMPLE_MAX] = \
+			{ [0 ... (TUNER_SIMPLE_MAX-1)] = 0 };
+module_param_array(atv_input, int, NULL, 0644);
+module_param_array(dtv_input, int, NULL, 0644);
+MODULE_PARM_DESC(atv_input, "specify atv rf input, 0 for autoselect");
+MODULE_PARM_DESC(dtv_input, "specify dtv rf input, 0 for autoselect");
+
 /* ---------------------------------------------------------------------- */
 
 /* tv standard selection for Temic 4046 FM5
@@ -92,6 +104,7 @@ static DEFINE_MUTEX(tuner_simple_list_mutex);
 static LIST_HEAD(hybrid_tuner_instance_list);
 
 struct tuner_simple_priv {
+	unsigned int nr;
 	u16 last_div;
 
 	struct tuner_i2c_props i2c_props;
@@ -284,7 +297,7 @@ static void simple_set_rf_input(struct dvb_frontend *fe,
 			break;
 		}
 		break;
-	case TUNER_PHILIPS_ATSC:
+	case TUNER_PHILIPS_FCV1236D:
 		switch (rf) {
 		case 1:
 			*cb |= 0x01;
@@ -356,7 +369,7 @@ static int simple_std_setup(struct dvb_frontend *fe,
 		}
 		break;
 
-	case TUNER_PHILIPS_ATSC:
+	case TUNER_PHILIPS_FCV1236D:
 		/* 0x00 -> ATSC antenna input 1 */
 		/* 0x01 -> ATSC antenna input 2 */
 		/* 0x02 -> NTSC antenna input 1 */
@@ -364,7 +377,6 @@ static int simple_std_setup(struct dvb_frontend *fe,
 		*cb &= ~0x03;
 		if (!(params->std & V4L2_STD_ATSC))
 			*cb |= 2;
-		/* FIXME: input */
 		break;
 
 	case TUNER_MICROTUNE_4042FI5:
@@ -396,10 +408,11 @@ static int simple_std_setup(struct dvb_frontend *fe,
 			tuner_warn("i2c i/o error: rc == %d "
 				   "(should be 2)\n", rc);
 		priv->i2c_props.addr = tuneraddr;
-		/* FIXME: input */
 		break;
 	}
 	}
+	if (atv_input[priv->nr])
+		simple_set_rf_input(fe, config, cb, atv_input[priv->nr]);
 
 	return 0;
 }
@@ -766,20 +779,23 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf,
 			buf[3] |= 1 << 3;
 		break;
 	case TUNER_PHILIPS_TUV1236D:
-	case TUNER_PHILIPS_ATSC:
+	case TUNER_PHILIPS_FCV1236D:
 	{
 		unsigned int new_rf;
 
-		switch (params->u.vsb.modulation) {
-		case QAM_64:
-		case QAM_256:
-			new_rf = 1;
-			break;
-		case VSB_8:
-		default:
-			new_rf = 0;
-			break;
-		}
+		if (dtv_input[priv->nr])
+			new_rf = dtv_input[priv->nr];
+		else
+			switch (params->u.vsb.modulation) {
+			case QAM_64:
+			case QAM_256:
+				new_rf = 1;
+				break;
+			case VSB_8:
+			default:
+				new_rf = 0;
+				break;
+			}
 		simple_set_rf_input(fe, &buf[2], &buf[3], new_rf);
 		break;
 	}
@@ -983,10 +999,32 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
 
 	if (type >= tuner_count) {
 		printk(KERN_WARNING "%s: invalid tuner type: %d (max: %d)\n",
-		       __FUNCTION__, type, tuner_count-1);
+		       __func__, type, tuner_count-1);
 		return NULL;
 	}
 
+	/* If i2c_adap is set, check that the tuner is at the correct address.
+	 * Otherwise, if i2c_adap is NULL, the tuner will be programmed directly
+	 * by the digital demod via calc_regs.
+	 */
+	if (i2c_adap != NULL) {
+		u8 b[1];
+		struct i2c_msg msg = {
+			.addr = i2c_addr, .flags = I2C_M_RD,
+			.buf = b, .len = 1,
+		};
+
+		if (fe->ops.i2c_gate_ctrl)
+			fe->ops.i2c_gate_ctrl(fe, 1);
+
+		if (1 != i2c_transfer(i2c_adap, &msg, 1))
+			tuner_warn("unable to probe %s, proceeding anyway.",
+				   tuners[type].name);
+
+		if (fe->ops.i2c_gate_ctrl)
+			fe->ops.i2c_gate_ctrl(fe, 0);
+	}
+
 	mutex_lock(&tuner_simple_list_mutex);
 
 	instance = hybrid_tuner_request_state(struct tuner_simple_priv, priv,
@@ -1003,6 +1041,7 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
 
 		priv->type = type;
 		priv->tun  = &tuners[type];
+		priv->nr   = simple_devcount++;
 		break;
 	default:
 		fe->tuner_priv = priv;
@@ -1016,6 +1055,24 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
 
 	tuner_info("type set to %d (%s)\n", type, priv->tun->name);
 
+	if ((debug) || ((atv_input[priv->nr] > 0) ||
+			(dtv_input[priv->nr] > 0))) {
+		if (0 == atv_input[priv->nr])
+			tuner_info("tuner %d atv rf input will be "
+				   "autoselected\n", priv->nr);
+		else
+			tuner_info("tuner %d atv rf input will be "
+				   "set to input %d (insmod option)\n",
+				   priv->nr, atv_input[priv->nr]);
+		if (0 == dtv_input[priv->nr])
+			tuner_info("tuner %d dtv rf input will be "
+				   "autoselected\n", priv->nr);
+		else
+			tuner_info("tuner %d dtv rf input will be "
+				   "set to input %d (insmod option)\n",
+				   priv->nr, dtv_input[priv->nr]);
+	}
+
 	strlcpy(fe->ops.tuner_ops.info.name, priv->tun->name,
 		sizeof(fe->ops.tuner_ops.info.name));