1 files changed, 64 insertions, 2 deletions

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 1a259c3966cd..690477a67917 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.33 2005/06/12 04:19:19 mchehab Exp $
+ * $Id: cx88-dvb.c,v 1.39 2005/07/02 20:00:46 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -30,9 +30,10 @@
 #include <linux/file.h>
 #include <linux/suspend.h>
 
-/* those two frontends need merging via linuxtv cvs ... */
+/* these three frontends need merging via linuxtv cvs ... */
 #define HAVE_CX22702 1
 #define HAVE_OR51132 1
+#define HAVE_LGDT3302 1
 
 #include "cx88.h"
 #include "dvb-pll.h"
@@ -44,6 +45,9 @@
 #if HAVE_OR51132
 # include "or51132.h"
 #endif
+#if HAVE_LGDT3302
+# include "lgdt3302.h"
+#endif
 
 MODULE_DESCRIPTION("driver for cx2388x based DVB cards");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
@@ -199,6 +203,32 @@ static struct or51132_config pchdtv_hd3000 = {
 };
 #endif
 
+#if HAVE_LGDT3302
+static int lgdt3302_set_ts_param(struct dvb_frontend* fe, int is_punctured)
+{
+        struct cx8802_dev *dev= fe->dvb->priv;
+        if (is_punctured)
+                dev->ts_gen_cntrl |= 0x04;
+        else
+                dev->ts_gen_cntrl &= ~0x04;
+        return 0;
+}
+
+static struct lgdt3302_config fusionhdtv_3_gold_q = {
+        .demod_address    = 0x0e,
+        .pll_address      = 0x61,
+        .pll_desc         = &dvb_pll_microtune_4042,
+        .set_ts_params    = lgdt3302_set_ts_param,
+};
+
+static struct lgdt3302_config fusionhdtv_3_gold_t = {
+        .demod_address    = 0x0e,
+        .pll_address      = 0x61,
+        .pll_desc         = &dvb_pll_thomson_dtt7611,
+        .set_ts_params    = lgdt3302_set_ts_param,
+};
+#endif
+
 static int dvb_register(struct cx8802_dev *dev)
 {
         /* init struct videobuf_dvb */
@@ -212,6 +242,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config,
                                                    &dev->core->i2c_adap);
                 break;
+        case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
         case CX88_BOARD_CONEXANT_DVB_T1:
                 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
                                                    &dev->core->i2c_adap);
@@ -231,6 +262,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 break;
         case CX88_BOARD_KWORLD_DVB_T:
         case CX88_BOARD_DNTV_LIVE_DVB_T:
+        case CX88_BOARD_ADSTECH_DVB_T_PCI:
                 dev->core->pll_addr = 0x61;
                 dev->core->pll_desc = &dvb_pll_unknown_1;
                 dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_config,
@@ -242,6 +274,36 @@ static int dvb_register(struct cx8802_dev *dev)
                                                  &dev->core->i2c_adap);
                 break;
 #endif
+#if HAVE_LGDT3302
+        case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
+                dev->ts_gen_cntrl = 0x08;
+                {
+                /* Do a hardware reset of chip before using it. */
+                struct cx88_core *core = dev->core;
+
+                cx_clear(MO_GP0_IO, 1);
+                mdelay(100);
+                cx_set(MO_GP0_IO, 9); // ANT connector too FIXME
+                mdelay(200);
+                dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold_q,
+                                                    &dev->core->i2c_adap);
+                }
+                break;
+        case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T:
+                dev->ts_gen_cntrl = 0x08;
+                {
+                /* Do a hardware reset of chip before using it. */
+                struct cx88_core *core = dev->core;
+
+                cx_clear(MO_GP0_IO, 1);
+                mdelay(100);
+                cx_set(MO_GP0_IO, 9); /* ANT connector too FIXME */
+                mdelay(200);
+                dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold_t,
+                                                    &dev->core->i2c_adap);
+                }
+                break;
+#endif
         default:
                 printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
                        dev->core->name);