diff options
author | Igor M. Liplianin <liplianin@me.by> | 2008-11-05 20:12:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:28 -0500 |
commit | 4cc0edff341294d14f3a6acb3ddb97abdf29b8c0 (patch) | |
tree | d105d3fa0f71323364b6e2f93449c4db2d6dffa7 /drivers/media/dvb/dvb-usb | |
parent | 5cff91a0336a5c8b1d64304a353687f4d242070c (diff) |
V4L/DVB (9537): Add TerraTec Cinergy S USB support
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>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dw2102.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c index c9431713df60..bc5e47a2b917 100644 --- a/drivers/media/dvb/dvb-usb/dw2102.c +++ b/drivers/media/dvb/dvb-usb/dw2102.c | |||
@@ -26,6 +26,10 @@ | |||
26 | #define USB_PID_DW2104 0x2104 | 26 | #define USB_PID_DW2104 0x2104 |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #ifndef USB_PID_CINERGY_S | ||
30 | #define USB_PID_CINERGY_S 0x0064 | ||
31 | #endif | ||
32 | |||
29 | #define DW210X_READ_MSG 0 | 33 | #define DW210X_READ_MSG 0 |
30 | #define DW210X_WRITE_MSG 1 | 34 | #define DW210X_WRITE_MSG 1 |
31 | 35 | ||
@@ -577,6 +581,7 @@ static struct usb_device_id dw2102_table[] = { | |||
577 | {USB_DEVICE(USB_VID_CYPRESS, 0x2101)}, | 581 | {USB_DEVICE(USB_VID_CYPRESS, 0x2101)}, |
578 | {USB_DEVICE(USB_VID_CYPRESS, 0x2104)}, | 582 | {USB_DEVICE(USB_VID_CYPRESS, 0x2104)}, |
579 | {USB_DEVICE(0x9022, 0xd650)}, | 583 | {USB_DEVICE(0x9022, 0xd650)}, |
584 | {USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)}, | ||
580 | { } | 585 | { } |
581 | }; | 586 | }; |
582 | 587 | ||
@@ -646,6 +651,7 @@ static int dw2102_load_firmware(struct usb_device *dev, | |||
646 | dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, | 651 | dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, |
647 | DW210X_WRITE_MSG); | 652 | DW210X_WRITE_MSG); |
648 | break; | 653 | break; |
654 | case USB_PID_CINERGY_S: | ||
649 | case USB_PID_DW2102: | 655 | case USB_PID_DW2102: |
650 | dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, | 656 | dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, |
651 | DW210X_WRITE_MSG); | 657 | DW210X_WRITE_MSG); |
@@ -725,7 +731,7 @@ static struct dvb_usb_device_properties dw2102_properties = { | |||
725 | }, | 731 | }, |
726 | } | 732 | } |
727 | }, | 733 | }, |
728 | .num_device_descs = 2, | 734 | .num_device_descs = 3, |
729 | .devices = { | 735 | .devices = { |
730 | {"DVBWorld DVB-S 2102 USB2.0", | 736 | {"DVBWorld DVB-S 2102 USB2.0", |
731 | {&dw2102_table[0], NULL}, | 737 | {&dw2102_table[0], NULL}, |
@@ -735,6 +741,10 @@ static struct dvb_usb_device_properties dw2102_properties = { | |||
735 | {&dw2102_table[1], NULL}, | 741 | {&dw2102_table[1], NULL}, |
736 | {NULL}, | 742 | {NULL}, |
737 | }, | 743 | }, |
744 | {"TerraTec Cinergy S USB", | ||
745 | {&dw2102_table[4], NULL}, | ||
746 | {NULL}, | ||
747 | }, | ||
738 | } | 748 | } |
739 | }; | 749 | }; |
740 | 750 | ||