redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

V4L/DVB (10267): Add support for TeVii S470 DVB-S2 PCI-e card. 

TeVii S470 DVB-S2 PCI-e card contains cx23885 PCI-e bridge
and cx24116 demodulator.
http://www.linuxtv.org/wiki/index.php/TeVii_S470
The card tested by me (Igor).

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
hifive-unleashed-5.1
Igor M. Liplianin 2009-01-17 12:18:26 -03:00 committed by Mauro Carvalho Chehab
parent 96318d0cca
commit 579943f548
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/video4linux/CARDLIST.cx23885
View File

@ -13,3 +13,4 @@
12 -> Leadtek Winfast PxDVR3200 H [107d:6681]
13 -> Compro VideoMate E650F [185b:e800]
14 -> TurboSight TBS 6920 [6920:8888]
15 -> TeVii S470 [d470:9022]

10
drivers/media/video/cx23885/cx23885-cards.c
View File

@ -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 */

14
drivers/media/video/cx23885/cx23885-dvb.c
View File

@ -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;
@ -554,6 +558,16 @@ static int dvb_register(struct cx23885_tsport *port)
if (fe0->dvb.frontend != NULL)
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 "

1
drivers/media/video/cx23885/cx23885.h
View File

@ -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 (\