V4L/DVB (3089): Adding support for the Hauppauge HVR1100 and HVR1100-LP products.

- Add support for the Hauppauge HVR1100 and HVR1100-LP products.
- Add i2c_gate_ctrl callback function to dvb_frontend_ops struct.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

5 files changed, 95 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index fd173e6ac605..b4fd1ef007ea 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -903,7 +903,6 @@ struct cx88_board cx88_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                /* fixme: add the analog gpio stuff here */
                 .input          = {{
                         .type   = CX88_VMUX_DVB,
                         .vmux   = 0,
@@ -946,6 +945,43 @@ struct cx88_board cx88_boards[] = {
                 }},
                 .dvb            = 1,
         },
+        [CX88_BOARD_HAUPPAUGE_HVR1100] = {
+                .name           = "Hauppauge WinTV-HVR1100 DVB-T/Hybrid",
+                .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                }},
+                /* fixme: Add radio support */
+                .dvb            = 1,
+        },
+        [CX88_BOARD_HAUPPAUGE_HVR1100LP] = {
+                .name           = "Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)",
+                .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                }},
+                /* fixme: Add radio support */
+                .dvb            = 1,
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1109,6 +1145,22 @@ struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x17de,
                 .subdevice = 0x08b2,
                 .card      = CX88_BOARD_KWORLD_DVBS_100,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x9400,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR1100,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x9402,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR1100,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x9800,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR1100LP,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x9802,
+                .card      = CX88_BOARD_HAUPPAUGE_HVR1100LP,
         },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
@@ -1140,9 +1192,6 @@ static void __devinit leadtek_eeprom(struct cx88_core *core, u8 *eeprom_data)
                core->name, core->tuner_type, eeprom_data[0]);
 }
 
-
-/* ----------------------------------------------------------------------- */
-
 static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
 {
         struct tveeprom tv;
@@ -1161,7 +1210,9 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
         case 90500: /* Nova-T-PCI (oem) */
         case 90501: /* Nova-T-PCI (oem/IR) */
         case 92000: /* Nova-SE2 (OEM, No Video or IR) */
-
+        case 94009: /* WinTV-HVR1100 (Video and IR Retail) */
+        case 94501: /* WinTV-HVR1100 (Video and IR OEM) */
+        case 98559: /* WinTV-HVR1100LP (Video no IR, Retail - Low Profile) */
                 /* known */
                 break;
         default:
@@ -1279,6 +1330,8 @@ void cx88_card_setup(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
+        case CX88_BOARD_HAUPPAUGE_HVR1100:
+        case CX88_BOARD_HAUPPAUGE_HVR1100LP:
                 if (0 == core->i2c_rc)
                         hauppauge_eeprom(core,eeprom);
                 break;
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 054094e48fc3..c4551d996119 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -191,6 +191,12 @@ static struct cx22702_config hauppauge_novat_config = {
         .pll_address   = 0x61,
         .pll_desc      = &dvb_pll_thomson_dtt759x,
 };
+static struct cx22702_config hauppauge_hvr1100_config = {
+        .demod_address = 0x63,
+        .output_mode   = CX22702_SERIAL_OUTPUT,
+        .pll_address   = 0x61,
+        .pll_desc      = &dvb_pll_fmd1216me,
+};
 #endif
 
 #ifdef HAVE_OR51132
@@ -370,6 +376,11 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
                                                    &dev->core->i2c_adap);
                 break;
+        case CX88_BOARD_HAUPPAUGE_HVR1100:
+        case CX88_BOARD_HAUPPAUGE_HVR1100LP:
+                dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config,
+                                                   &dev->core->i2c_adap);
+                break;
 #endif
 #ifdef HAVE_MT352
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
@@ -532,6 +543,9 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev,
         err = dvb_register(dev);
         if (0 != err)
                 goto fail_fini;
+
+        /* Maintain a reference to cx88-video can query the 8802 device. */
+        core->dvbdev = dev;
         return 0;
 
  fail_fini:
@@ -547,6 +561,9 @@ static void __devexit dvb_remove(struct pci_dev *pci_dev)
 {
         struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
 
+        /* Destroy any 8802 reference. */
+        dev->core->dvbdev = NULL;
+
         /* dvb */
         videobuf_dvb_unregister(&dev->dvb);
 
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 4a8fb161b16a..7363dd6e66e2 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -135,7 +135,20 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
 {
         if (0 != core->i2c_rc)
                 return;
-        i2c_clients_command(&core->i2c_adap, cmd, arg);
+
+        if (core->dvbdev == NULL) {
+                i2c_clients_command(&core->i2c_adap, cmd, arg);
+        } else {
+
+                if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
+                        core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);
+
+                i2c_clients_command(&core->i2c_adap, cmd, arg);
+
+                if (core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl)
+                        core->dvbdev->dvb.frontend->ops->i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
+        }
+
 }
 
 static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index d7e9813384d8..a89bb2b195f3 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -390,6 +390,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
+        case CX88_BOARD_HAUPPAUGE_HVR1100:
                 ir_codes = ir_codes_hauppauge_new;
                 ir_type = IR_TYPE_RC5;
                 ir->sampling = 1;
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 11dc0335151c..3e2bcd241a27 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -182,6 +182,8 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1  37
 #define CX88_BOARD_HAUPPAUGE_NOVASE2_S1    38
 #define CX88_BOARD_KWORLD_DVBS_100         39
+#define CX88_BOARD_HAUPPAUGE_HVR1100       40
+#define CX88_BOARD_HAUPPAUGE_HVR1100LP     41
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,
@@ -304,6 +306,9 @@ struct cx88_core {
 
         /* various v4l controls */
         u32                        freq;
+
+        /* cx88-video needs to access cx8802 for hybrid tuner pll access. */
+        struct cx8802_dev          *dvbdev;
 };
 
 struct cx8800_dev;