1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index caa098beeec..0b050bc88ef 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -162,6 +162,10 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Compro VideoMate E650F",
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_TBS_6920] = {
+                .name           = "TurboSight TBS 6920",
+                .portb          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -245,6 +249,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x185b,
                 .subdevice = 0xe800,
                 .card      = CX23885_BOARD_COMPRO_VIDEOMATE_E650F,
+        }, {
+                .subvendor = 0x6920,
+                .subdevice = 0x8888,
+                .card      = CX23885_BOARD_TBS_6920,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -552,6 +560,11 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(20);
                 cx_set(GP0_IO, 0x00040004);
                 break;
+        case CX23885_BOARD_TBS_6920:
+                cx_write(MC417_CTL, 0x00000036);
+                cx_write(MC417_OEN, 0x00001000);
+                cx_write(MC417_RWD, 0x00001800);
+                break;
         }
 }
 
@@ -632,6 +645,11 @@ 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_TBS_6920:
+                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;
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q: