V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards

Added support for Prof 7300 DVB-S/S2 card. The card
based on cx24116 demodulator.

Signed-off-by: Oleg Roitburd <oroitburd@gmail.com>
Signed-off-by: Steven Toth <stoth@linuxtv.org>
[mchehab@redhat.com: fixed CARDLIST.cx88 entry]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 50d0b1c559a9aa0def7466767043f5124723a61d..a5227e308f4ab91146dc2426a2bd694d95d63043 100644 (file)
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -73,3 +73,4 @@
  72 -> TBS 8920 DVB-S/S2                                   [8920:8888]
  73 -> TeVii S420 DVB-S                                    [d420:9022]
  74 -> Prolink Pixelview Global Extreme                    [1554:4976]
+ 75 -> PROF 7300 DVB-S/S2                                  [B033:3033]

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index a9e52decb6f9fc0a37996c55de2c12a9dc67646d..5da04e811ca20b3941b086e73566c91d081d27e6 100644 (file)
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1822,6 +1822,18 @@ static const struct cx88_board cx88_boards[] = {
                } },
                .mpeg           = CX88_MPEG_DVB,
        },
+       [CX88_BOARD_PROF_7300] = {
+               .name           = "PROF 7300 DVB-S/S2",
+               .tuner_type     = UNSET,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_DVB,
+                       .vmux   = 0,
+               } },
+               .mpeg           = CX88_MPEG_DVB,
+       },
 };
 
 /* ------------------------------------------------------------------ */
@@ -2211,6 +2223,10 @@ static const struct cx88_subid cx88_subids[] = {
                .subvendor = 0x8920,
                .subdevice = 0x8888,
                .card      = CX88_BOARD_TBS_8920,
+       }, {
+               .subvendor = 0xB033,
+               .subdevice = 0x3033,
+               .card      = CX88_BOARD_PROF_7300,
        },
 };
 
@@ -2817,18 +2833,9 @@ static void cx88_card_setup(struct cx88_core *core)
        }
        case  CX88_BOARD_TEVII_S420:
        case  CX88_BOARD_TEVII_S460:
-               cx_write(MO_SRST_IO, 0);
-               msleep(100);
-               cx_write(MO_SRST_IO, 1);
-               msleep(100);
-               break;
        case  CX88_BOARD_OMICOM_SS4_PCI:
-               cx_write(MO_SRST_IO, 0);
-               msleep(100);
-               cx_write(MO_SRST_IO, 1);
-               msleep(100);
-               break;
        case  CX88_BOARD_TBS_8920:
+       case  CX88_BOARD_PROF_7300:
                cx_write(MO_SRST_IO, 0);
                msleep(100);
                cx_write(MO_SRST_IO, 1);

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index cccf38222a3152dc437bc8bc1e2fc1cd403c0abb..344ed2626e597e3a47c0e0307ee1f5001bae92da 100644 (file)
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -978,15 +978,8 @@ static int dvb_register(struct cx8802_dev *dev)
                }
                break;
        case CX88_BOARD_OMICOM_SS4_PCI:
-               dev->dvb.frontend = dvb_attach(cx24116_attach,
-                                              &hauppauge_hvr4000_config,
-                                              &core->i2c_adap);
-               if (dev->dvb.frontend != NULL) {
-                       core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
-                       dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
-               }
-               break;
        case CX88_BOARD_TBS_8920:
+       case CX88_BOARD_PROF_7300:
                dev->dvb.frontend = dvb_attach(cx24116_attach,
                                               &hauppauge_hvr4000_config,
                                               &core->i2c_adap);

diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index dce7d36edb426a4d1a462bb5645a60b9c60ff734..dbf01b8b57a52876b0cfe7ae67f4e3665f6c0a1d 100644 (file)
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -228,6 +228,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_TBS_8920                72
 #define CX88_BOARD_TEVII_S420              73
 #define CX88_BOARD_PROLINK_PV_GLOBAL_XTREME 74
+#define CX88_BOARD_PROF_7300               75
 
 enum cx88_itype {
        CX88_VMUX_COMPOSITE1 = 1,