aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorStefan Lippers-Hollmann <s.L-H@gmx.de>2010-08-25 09:08:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:04:52 -0400
commitd7ef485daa657456cad4994873148377b3561b8b (patch)
tree33d9d3611845456f15d386284e8fbc79ff813d76 /drivers/media/dvb
parent2e4e98e788d8fbe30892bee3375067a4937155da (diff)
V4L/DVB: af9015: add USB ID for Terratec Cinergy T Stick RC MKII
Adding the USB ID for my TerraTec Electronic GmbH Cinergy T RC MKII [0ccd:0097] and hooking it up into af9015, on top of your new NXP TDA18218 patches, makes it work for me. Just the shipped IR remote control doesn't seem to create keycode events yet (tested with different remote=%d parameters), are there any hints to add support for that? [ 2.250022] usb 1-10: new high speed USB device using ehci_hcd and address 5 [ 2.369287] usb 1-10: New USB device found, idVendor=0ccd, idProduct=0097 [ 2.369290] usb 1-10: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 2.369293] usb 1-10: Product: USB2.0 DVB-T TV Stick [ 2.369294] usb 1-10: Manufacturer: NEWMI [ 2.369296] usb 1-10: SerialNumber: 010101010600001 [ 2.534023] usbcore: registered new interface driver hiddev [ 2.537235] input: NEWMI USB2.0 DVB-T TV Stick as /devices/pci0000:00/0000:00:02.1/usb1/1-10/1-10:1.1/input/input0 [ 2.537323] generic-usb 0003:0CCD:0097.0001: input,hidraw0: USB HID v1.01 Keyboard [NEWMI USB2.0 DVB-T TV Stick] on usb-0000:00:02.1-10/input1 [ 2.537349] usbcore: registered new interface driver usbhid [ 2.537351] usbhid: USB HID core driver [ 3.263177] generic-usb 0003:04D9:1603.0002: input,hidraw1: USB HID v1.10 Keyboard [ USB Keyboard] on usb-0000:00:02.0-8.1/input0 [ 3.286946] generic-usb 0003:04D9:1603.0003: input,hidraw2: USB HID v1.10 Device [ USB Keyboard] on usb-0000:00:02.0-8.1/input1 [ 3.467136] generic-usb 0003:046D:C050.0004: input,hidraw3: USB HID v1.10 Mouse [Logitech USB-PS/2 Optical Mouse] on usb-0000:00:02.0-8.2/input0 [ 3.660890] generic-usb 0003:10D5:000D.0005: input,hidraw4: USB HID v1.10 Keyboard [No brand SP02-A1] on usb-0000:00:02.0-8.3/input0 [ 5.567632] dvb-usb: found a 'TerraTec Cinergy T Stick RC' in cold state, will try to load a firmware [ 5.693497] dvb-usb: downloading firmware from file 'dvb-usb-af9015.fw' [ 5.773109] dvb-usb: found a 'TerraTec Cinergy T Stick RC' in warm state. [ 5.773168] dvb-usb: will pass the complete MPEG2 transport stream to the software demuxer. [ 5.774290] DVB: registering new adapter (TerraTec Cinergy T Stick RC) [ 6.007696] af9013: firmware version:5.1.0 [ 6.010843] DVB: registering adapter 0 frontend 0 (Afatech AF9013 DVB-T)... [ 6.032697] tda18218: NXP TDA18218HN successfully identified. [ 6.034442] dvb-usb: TerraTec Cinergy T Stick RC successfully initialized and connected. [ 6.040612] usbcore: registered new interface driver dvb_usb_af9015 [mchehab@redhat.com: Fix merge conflict with another board addition] Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> Acked-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c19
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 20 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 750a1b515139..55a12df9a2f9 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1308,6 +1308,7 @@ static struct usb_device_id af9015_usb_table[] = {
1308/* 30 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB383_T)}, 1308/* 30 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB383_T)},
1309 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)}, 1309 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U_4)},
1310 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)}, 1310 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A815M)},
1311 {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_STICK_RC)},
1311 {0}, 1312 {0},
1312}; 1313};
1313MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1314MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1637,6 +1638,24 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1637 .cold_ids = {&af9015_usb_table[32], NULL}, 1638 .cold_ids = {&af9015_usb_table[32], NULL},
1638 .warm_ids = {NULL}, 1639 .warm_ids = {NULL},
1639 }, 1640 },
1641 },
1642
1643 .identify_state = af9015_identify_state,
1644
1645 .rc.legacy = {
1646 .rc_query = af9015_rc_query,
1647 .rc_interval = 150,
1648 },
1649
1650 .i2c_algo = &af9015_i2c_algo,
1651
1652 .num_device_descs = 1, /* max 9 */
1653 .devices = {
1654 {
1655 .name = "TerraTec Cinergy T Stick RC",
1656 .cold_ids = {&af9015_usb_table[33], NULL},
1657 .warm_ids = {NULL},
1658 },
1640 } 1659 }
1641 }, 1660 },
1642}; 1661};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 1a774d58d664..dc6a0f194e5b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -133,6 +133,7 @@
133#define USB_PID_KWORLD_VSTREAM_WARM 0x17df 133#define USB_PID_KWORLD_VSTREAM_WARM 0x17df
134#define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055 134#define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055
135#define USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2 0x0069 135#define USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2 0x0069
136#define USB_PID_TERRATEC_CINERGY_T_STICK_RC 0x0097
136#define USB_PID_TWINHAN_VP7041_COLD 0x3201 137#define USB_PID_TWINHAN_VP7041_COLD 0x3201
137#define USB_PID_TWINHAN_VP7041_WARM 0x3202 138#define USB_PID_TWINHAN_VP7041_WARM 0x3202
138#define USB_PID_TWINHAN_VP7020_COLD 0x3203 139#define USB_PID_TWINHAN_VP7020_COLD 0x3203