aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2010-02-10 18:05:48 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:57 -0500
commitfa1df55c3f99d32eccf3eeb3c9dad4456ebcf1f4 (patch)
tree3fcda7ddfb01e4f5c23444fd5a14a3ef9fa7443f /drivers
parentfd9be0dc9b0b2baf203cfef8c8109859d05d0e01 (diff)
V4L/DVB: af9015: support for DigitalNow TinyTwin v2
Add USB ID 1b80:e402 for DigitalNow TinyTwin version 2. Thanks to Trevor Phillips <trevor.phillips@gmail.com> for reporting this. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c4
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index 47ab2e92c6af..10aaedc01428 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1291,6 +1291,7 @@ static struct usb_device_id af9015_usb_table[] = {
1291/* 25 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)}, 1291/* 25 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)},
1292 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)}, 1292 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)},
1293 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV20)}, 1293 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV20)},
1294 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_TINYTWIN_2)},
1294 {0}, 1295 {0},
1295}; 1296};
1296MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1297MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1377,7 +1378,8 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1377 }, 1378 },
1378 { 1379 {
1379 .name = "DigitalNow TinyTwin DVB-T Receiver", 1380 .name = "DigitalNow TinyTwin DVB-T Receiver",
1380 .cold_ids = {&af9015_usb_table[5], NULL}, 1381 .cold_ids = {&af9015_usb_table[5],
1382 &af9015_usb_table[28], NULL},
1381 .warm_ids = {NULL}, 1383 .warm_ids = {NULL},
1382 }, 1384 },
1383 { 1385 {
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 90cdac7ccd87..19e2c98002cb 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -138,6 +138,7 @@
138#define USB_PID_TWINHAN_VP7021_COLD 0x3207 138#define USB_PID_TWINHAN_VP7021_COLD 0x3207
139#define USB_PID_TWINHAN_VP7021_WARM 0x3208 139#define USB_PID_TWINHAN_VP7021_WARM 0x3208
140#define USB_PID_TINYTWIN 0x3226 140#define USB_PID_TINYTWIN 0x3226
141#define USB_PID_TINYTWIN_2 0xe402
141#define USB_PID_DNTV_TINYUSB2_COLD 0x3223 142#define USB_PID_DNTV_TINYUSB2_COLD 0x3223
142#define USB_PID_DNTV_TINYUSB2_WARM 0x3224 143#define USB_PID_DNTV_TINYUSB2_WARM 0x3224
143#define USB_PID_ULTIMA_TVBOX_COLD 0x8105 144#define USB_PID_ULTIMA_TVBOX_COLD 0x8105