- tda9887: rollback secam fixup for now ...

5 files changed, 28 insertions, 21 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index e44e43ab2..fc43a3af7 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-cards.c,v 1.58 2005/01/31 11:35:05 kraxel Exp $
+ * $Id: cx88-cards.c,v 1.59 2005/02/04 11:42:14 kraxel Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
@@ -648,19 +648,14 @@ static int hauppauge_eeprom_dvb(struct cx88_core *core, u8 *ee)
 	switch(tuner) {
 	case 0x4B: /* dtt 7595 */
 	case 0x4C: /* dtt 7592 */
-		core->pll_desc = &dvb_pll_thomson_dtt759x;
 		break;
 	default:
 		printk("%s: error: unknown hauppauge tuner 0x%02x\n",
 		       core->name, tuner);
 		return -ENODEV;
 	}
-	printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d (%s)\n",
-	       core->name, model, tuner,
-	       core->pll_desc ? core->pll_desc->name : "UNKNOWN");
-
-	core->pll_addr   = 0x61;
-	core->demod_addr = 0x43;
+	printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d\n",
+	       core->name, model, tuner);
 }
 #endif
 
@@ -770,11 +765,6 @@ void cx88_card_setup(struct cx88_core *core)
 		if (0 == core->i2c_rc)
 			hauppauge_eeprom_dvb(core,eeprom);
 		break;
-	case CX88_BOARD_CONEXANT_DVB_T1:
-		core->pll_desc   = &dvb_pll_thomson_dtt7579;
-		core->pll_addr   = 0x60;
-		core->demod_addr = 0x43;
-		break;
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
 		/* GPIO0:0 is hooked to mt352 reset pin */
 		cx_set(MO_GP0_IO, 0x00000101);
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index f8599922b..592b9e6a3 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.23 2005/01/31 11:35:05 kraxel Exp $
+ * $Id: cx88-dvb.c,v 1.24 2005/02/04 11:42:14 kraxel Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -159,6 +159,18 @@ static struct mt352_config dntv_live_dvbt_config = {
 	.pll_set       = mt352_pll_set,
 };
 
+static struct cx22702_config connexant_refboard_config = {
+	.demod_address = 0x43,
+	.pll_address   = 0x60,
+	.pll_desc      = &dvb_pll_thomson_dtt7579,
+};
+
+static struct cx22702_config hauppauge_novat_config = {
+	.demod_address = 0x43,
+	.pll_address   = 0x61,
+	.pll_desc      = &dvb_pll_thomson_dtt759x,
+};
+
 static int dvb_register(struct cx8802_dev *dev)
 {
 	/* init struct videobuf_dvb */
@@ -167,11 +179,12 @@ static int dvb_register(struct cx8802_dev *dev)
 	/* init frontend */
 	switch (dev->core->board) {
 	case CX88_BOARD_HAUPPAUGE_DVB_T1:
+		dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config,
+						   &dev->core->i2c_adap);
+		break;
 	case CX88_BOARD_CONEXANT_DVB_T1:
-		dev->dvb.frontend = cx22702_create(&dev->core->i2c_adap,
-						   dev->core->pll_addr,
-						   dev->core->pll_desc,
-						   dev->core->demod_addr);
+		dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
+						   &dev->core->i2c_adap);
 		break;
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 571c979b8..5bcf322bb 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.49 2005/01/20 12:54:46 kraxel Exp $
+ * $Id: cx88.h,v 1.50 2005/02/04 11:42:14 kraxel Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -259,7 +259,6 @@ struct cx88_core {
 	/* config info -- dvb */
 	struct dvb_pll_desc        *pll_desc;
 	unsigned int               pll_addr;
-	unsigned int               demod_addr;
 
 	/* state info */
 	struct task_struct         *kthread;
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c
index aa11ec6cc..b846990ea 100644
--- a/linux/drivers/media/video/tda9887.c
+++ b/linux/drivers/media/video/tda9887.c
@@ -562,10 +562,15 @@ static int tda9887_configure(struct tda9887 *t)
 	tda9887_set_config(t,buf);
 	tda9887_set_insmod(t,buf);
 
+#if 0
+	/* This as-is breaks some cards, must be fixed in a
+	 * card-specific way, probably using TDA9887_SET_CONFIG to
+	 * turn on/off port2 */
 	if (t->std & V4L2_STD_SECAM_L) {
 		/* secam fixup (FIXME: move this to tvnorms array?) */
 		buf[1] &= ~cOutputPort2Inactive;
 	}
+#endif
 
 	dprintk(PREFIX "writing: b=0x%02x c=0x%02x e=0x%02x\n",
 		buf[1],buf[2],buf[3]);
diff --git a/v4l/scripts/update b/v4l/scripts/update
index f52983e4c..e03fb5a55 100644
--- a/v4l/scripts/update
+++ b/v4l/scripts/update
@@ -99,5 +99,5 @@ xinsmod saa7134-empress
 xinsmod cx22702 debug=0
 xinsmod mt352	debug=1
 xinsmod video-buf-dvb
-#xinsmod cx88-dvb
+xinsmod cx88-dvb
 xinsmod saa7134-dvb