aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885-cards.c
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2009-01-17 10:11:20 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:23 -0400
commit96318d0cca02a91b22a2e1a1097ffeea0b3becae (patch)
tree7bf49b7ba8840efd8cbd3c0dbf53cae530ace729 /drivers/media/video/cx23885/cx23885-cards.c
parentc76b638ca20d6cbf91ee017c6f2afd7d3fcd57ff (diff)
V4L/DVB (10266): Add support for TurboSight TBS6920 DVB-S2 PCI-e card.
TurboSight TBS6920 DVB-S2 PCI-e card contains cx23885 PCI-e bridge and cx24116 demodulator. http://www.linuxtv.org/wiki/index.php/TBS_6920 The card tested by me (Igor). Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-cards.c')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c18
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 caa098beeecf..0b050bc88ef5 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[] = {
162 .name = "Compro VideoMate E650F", 162 .name = "Compro VideoMate E650F",
163 .portc = CX23885_MPEG_DVB, 163 .portc = CX23885_MPEG_DVB,
164 }, 164 },
165 [CX23885_BOARD_TBS_6920] = {
166 .name = "TurboSight TBS 6920",
167 .portb = CX23885_MPEG_DVB,
168 },
165}; 169};
166const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); 170const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
167 171
@@ -245,6 +249,10 @@ struct cx23885_subid cx23885_subids[] = {
245 .subvendor = 0x185b, 249 .subvendor = 0x185b,
246 .subdevice = 0xe800, 250 .subdevice = 0xe800,
247 .card = CX23885_BOARD_COMPRO_VIDEOMATE_E650F, 251 .card = CX23885_BOARD_COMPRO_VIDEOMATE_E650F,
252 }, {
253 .subvendor = 0x6920,
254 .subdevice = 0x8888,
255 .card = CX23885_BOARD_TBS_6920,
248 }, 256 },
249}; 257};
250const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); 258const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -552,6 +560,11 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
552 mdelay(20); 560 mdelay(20);
553 cx_set(GP0_IO, 0x00040004); 561 cx_set(GP0_IO, 0x00040004);
554 break; 562 break;
563 case CX23885_BOARD_TBS_6920:
564 cx_write(MC417_CTL, 0x00000036);
565 cx_write(MC417_OEN, 0x00001000);
566 cx_write(MC417_RWD, 0x00001800);
567 break;
555 } 568 }
556} 569}
557 570
@@ -632,6 +645,11 @@ void cx23885_card_setup(struct cx23885_dev *dev)
632 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ 645 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
633 ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; 646 ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
634 break; 647 break;
648 case CX23885_BOARD_TBS_6920:
649 ts1->gen_ctrl_val = 0x5; /* Parallel */
650 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
651 ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
652 break;
635 case CX23885_BOARD_HAUPPAUGE_HVR1250: 653 case CX23885_BOARD_HAUPPAUGE_HVR1250:
636 case CX23885_BOARD_HAUPPAUGE_HVR1500: 654 case CX23885_BOARD_HAUPPAUGE_HVR1500:
637 case CX23885_BOARD_HAUPPAUGE_HVR1500Q: 655 case CX23885_BOARD_HAUPPAUGE_HVR1500Q: