3 files changed, 25 insertions, 0 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 0b050bc88ef..dbc59d26f6f 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -166,6 +166,10 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "TurboSight TBS 6920",
                 .portb          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_TEVII_S470] = {
+                .name           = "TeVii S470",
+                .portb          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -253,6 +257,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x6920,
                 .subdevice = 0x8888,
                 .card      = CX23885_BOARD_TBS_6920,
+        }, {
+                .subvendor = 0xd470,
+                .subdevice = 0x9022,
+                .card      = CX23885_BOARD_TEVII_S470,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -561,6 +569,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x00040004);
                 break;
         case CX23885_BOARD_TBS_6920:
+        case CX23885_BOARD_TEVII_S470:
                 cx_write(MC417_CTL, 0x00000036);
                 cx_write(MC417_OEN, 0x00001000);
                 cx_write(MC417_RWD, 0x00001800);
@@ -645,6 +654,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
+        case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_TBS_6920:
                 ts1->gen_ctrl_val  = 0x5; /* Parallel */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 3e0b04074e5..a6b62a7bf61 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -327,6 +327,10 @@ static struct cx24116_config tbs_cx24116_config = {
         .demod_address = 0x05,
 };
 
+static struct cx24116_config tevii_cx24116_config = {
+        .demod_address = 0x55,
+};
+
 static int dvb_register(struct cx23885_tsport *port)
 {
         struct cx23885_dev *dev = port->dev;
@@ -555,6 +559,16 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend->ops.set_voltage = tbs_set_voltage;
 
                 break;
+        case CX23885_BOARD_TEVII_S470:
+                i2c_bus = &dev->i2c_bus[1];
+
+                fe0->dvb.frontend = dvb_attach(cx24116_attach,
+                        &tevii_cx24116_config,
+                        &i2c_bus->i2c_adap);
+                if (fe0->dvb.frontend != NULL)
+                        fe0->dvb.frontend->ops.set_voltage = tbs_set_voltage;
+
+                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 b4f23238598..01856fb48a4 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -68,6 +68,7 @@
 #define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12
 #define CX23885_BOARD_COMPRO_VIDEOMATE_E650F   13
 #define CX23885_BOARD_TBS_6920                 14
+#define CX23885_BOARD_TEVII_S470               15
 
 /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
 #define CX23885_NORMS (\