V4L (0979): Added V4L support for the Nova-S-Plus and Nova-SE2 DVB-S products

- Added V4L support for the Nova-S-Plus and Nova-SE2 DVB-S products.
- Basic DVB-S support is working, analog video inputs work.
- It has one or two fixme comments, primarily analog GPIOs (audio) and eeprom parsing.
- CX24123 code (in cx88-dvb.c) disabled until the
- cx24123 module is added to dvb-kernel cvs.

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>

1 files changed, 41 insertions, 0 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 951709aa88ba..d738ea8c6f5e 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -897,6 +897,37 @@ struct cx88_board cx88_boards[] = {
                         .gpio3  = 0x0000,
                 }},
         },
+        [CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1] = {
+                .name           = "Hauppauge Nova-S-Plus DVB-S",
+                .tuner_type     = TUNER_ABSENT,
+                .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,
+                },{
+                        .type   = CX88_VMUX_COMPOSITE1,
+                        .vmux   = 1,
+                },{
+                        .type   = CX88_VMUX_SVIDEO,
+                        .vmux   = 2,
+                }},
+                .dvb            = 1,
+        },
+        [CX88_BOARD_HAUPPAUGE_NOVASE2_S1] = {
+                .name           = "Hauppauge Nova-SE2 DVB-S",
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                }},
+                .dvb            = 1,
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1044,6 +1075,14 @@ struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x1461,
                 .subdevice = 0x000a,
                 .card      = CX88_BOARD_AVERTV_303,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x9200,
+                .card      = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1,
+        },{
+                .subvendor = 0x0070,
+                .subdevice = 0x9202,
+                .card      = CX88_BOARD_HAUPPAUGE_NOVASE2_S1,
         },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
@@ -1211,6 +1250,8 @@ void cx88_card_setup(struct cx88_core *core)
                 if (0 == core->i2c_rc)
                         leadtek_eeprom(core,eeprom);
                 break;
+        case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
+        case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
                 if (0 == core->i2c_rc)
                         hauppauge_eeprom(core,eeprom);