V4L/DVB (10269): Add support for DVBWorld DVBS2 PCI-e 2005.

DVBWorld DVBS2 PCI-e 2005 card contains cx23885 PCI-e bridge
and cx24116 demodulator.
http://www.linuxtv.org/wiki/index.php/DVBWorld_DVB-S2_2005_PCI-Express_Card
The card tested by me (Igor).

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

4 files changed, 22 insertions, 0 deletions

diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 43d290ea75bf..5937ff958f04 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -14,3 +14,4 @@
  13 -> Compro VideoMate E650F                              [185b:e800]
  14 -> TurboSight TBS 6920                                 [6920:8888]
  15 -> TeVii S470                                          [d470:9022]
+ 16 -> DVBWorld DVB-S2 2005                                [0001:2005]
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index dbc59d26f6f6..7ff339a2e3f2 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -170,6 +170,10 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "TeVii S470",
                 .portb          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_DVBWORLD_2005] = {
+                .name           = "DVBWorld DVB-S2 2005",
+                .portb          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -261,6 +265,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0xd470,
                 .subdevice = 0x9022,
                 .card      = CX23885_BOARD_TEVII_S470,
+        }, {
+                .subvendor = 0x0001,
+                .subdevice = 0x2005,
+                .card      = CX23885_BOARD_DVBWORLD_2005,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -656,6 +664,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 break;
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_TBS_6920:
+        case CX23885_BOARD_DVBWORLD_2005:
                 ts1->gen_ctrl_val  = 0x5; /* Parallel */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index a6b62a7bf618..14a6540b826c 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -331,6 +331,10 @@ static struct cx24116_config tevii_cx24116_config = {
         .demod_address = 0x55,
 };
 
+static struct cx24116_config dvbworld_cx24116_config = {
+        .demod_address = 0x05,
+};
+
 static int dvb_register(struct cx23885_tsport *port)
 {
         struct cx23885_dev *dev = port->dev;
@@ -569,6 +573,13 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend->ops.set_voltage = tbs_set_voltage;
 
                 break;
+        case CX23885_BOARD_DVBWORLD_2005:
+                i2c_bus = &dev->i2c_bus[1];
+
+                fe0->dvb.frontend = dvb_attach(cx24116_attach,
+                        &dvbworld_cx24116_config,
+                        &i2c_bus->i2c_adap);
+                break;
         default:
                 printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
                         " isn't supported yet\n",
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 01856fb48a40..37a88b1683c3 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -69,6 +69,7 @@
 #define CX23885_BOARD_COMPRO_VIDEOMATE_E650F   13
 #define CX23885_BOARD_TBS_6920                 14
 #define CX23885_BOARD_TEVII_S470               15
+#define CX23885_BOARD_DVBWORLD_2005            16
 
 /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
 #define CX23885_NORMS (\