korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 09:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (9537): Add TerraTec Cinergy S USB support

Browse Source 
Add TerraTec Cinergy S USB support

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Acked-by: Thorsten Leupold <th86@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Igor M. Liplianin 2008-11-05 22:12:56 -03:00 committed by Mauro Carvalho Chehab
parent 5cff91a033
commit 4cc0edff34
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/dvb/dvb-usb/dw2102.c
View File

@ -26,6 +26,10 @@
#define USB_PID_DW2104 0x2104 #define USB_PID_DW2104 0x2104
#endif #endif
#ifndef USB_PID_CINERGY_S
#define USB_PID_CINERGY_S 0x0064
#endif
#define DW210X_READ_MSG 0 #define DW210X_READ_MSG 0
#define DW210X_WRITE_MSG 1 #define DW210X_WRITE_MSG 1
@ -577,6 +581,7 @@ static struct usb_device_id dw2102_table[] = {
{USB_DEVICE(USB_VID_CYPRESS, 0x2101)}, {USB_DEVICE(USB_VID_CYPRESS, 0x2101)},
{USB_DEVICE(USB_VID_CYPRESS, 0x2104)}, {USB_DEVICE(USB_VID_CYPRESS, 0x2104)},
{USB_DEVICE(0x9022, 0xd650)}, {USB_DEVICE(0x9022, 0xd650)},
{USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},
{ } { }
}; };
@ -646,6 +651,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
DW210X_WRITE_MSG); DW210X_WRITE_MSG);
break; break;
case USB_PID_CINERGY_S:
case USB_PID_DW2102: case USB_PID_DW2102:
dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
DW210X_WRITE_MSG); DW210X_WRITE_MSG);
@ -725,7 +731,7 @@ static struct dvb_usb_device_properties dw2102_properties = {
}, },
} }
}, },
.num_device_descs = 2, .num_device_descs = 3,
.devices = { .devices = {
{"DVBWorld DVB-S 2102 USB2.0", {"DVBWorld DVB-S 2102 USB2.0",
{&dw2102_table[0], NULL}, {&dw2102_table[0], NULL},
@ -735,6 +741,10 @@ static struct dvb_usb_device_properties dw2102_properties = {
{&dw2102_table[1], NULL}, {&dw2102_table[1], NULL},
{NULL}, {NULL},
}, },
{"TerraTec Cinergy S USB",
{&dw2102_table[4], NULL},
{NULL},
},
} }
}; };