3 files changed, 32 insertions, 0 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 23948daae85e..afaafd519eac 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1721,6 +1721,18 @@ static const struct cx88_board cx88_boards[] = {
                 } },
                 .mpeg           = CX88_MPEG_DVB,
         },
+        [CX88_BOARD_OMICOM_SS4_PCI] = {
+                .name           = "Omicom SS4 DVB-S/S2 PCI",
+                .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,
+        },
 };
 
 /* ------------------------------------------------------------------ */
@@ -2094,6 +2106,10 @@ static const struct cx88_subid cx88_subids[] = {
                 .subvendor = 0xD460,
                 .subdevice = 0x9022,
                 .card      = CX88_BOARD_TEVII_S460,
+        }, {
+                .subvendor = 0xA044,
+                .subdevice = 0x2011,
+                .card      = CX88_BOARD_OMICOM_SS4_PCI,
         },
 };
 
@@ -2673,6 +2689,12 @@ static void cx88_card_setup(struct cx88_core *core)
                 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;
         } /*end switch() */
 
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index ce1752dc8e2b..c86802b913ed 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -958,6 +958,15 @@ static int dvb_register(struct cx8802_dev *dev)
                         dev->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
                 }
                 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;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
                        core->name);
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 2b82c6aac89a..628371b49c56 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -224,6 +224,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_HAUPPAUGE_HVR4000       68
 #define CX88_BOARD_HAUPPAUGE_HVR4000LITE   69
 #define CX88_BOARD_TEVII_S460              70
+#define CX88_BOARD_OMICOM_SS4_PCI          71
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,