aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2008-11-04 10:57:47 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:27 -0500
commit163e9cd074c2471695c5c79da0022f46fa53ce40 (patch)
tree00021c2658fd4ba05b2f733aaaab788ff5a6b292 /drivers/media/dvb
parentc78de71ca382e18885907bff246cba496e8b0988 (diff)
V4L/DVB (9526): af9015: add support for KWorld USB DVB-T TV Stick II (VS-DVBT 395U)
- add USB-ID 1b80:e396 for KWorld USB DVB-T TV Stick II (VS-DVBT 395U) Thanks-to: Bo Hansen <bohans@online.no> Signed-off-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.c9
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index d8887b745612..f93a8c739bd1 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -1201,6 +1201,7 @@ static struct usb_device_id af9015_usb_table[] = {
1201 {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)}, 1201 {USB_DEVICE(USB_VID_TELESTAR, USB_PID_TELESTAR_STARSTICK_2)},
1202 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)}, 1202 {USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A309)},
1203/* 15 */{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)}, 1203/* 15 */{USB_DEVICE(USB_VID_MSI_2, USB_PID_MSI_DIGI_VOX_MINI_III)},
1204 {USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_395U)},
1204 {0}, 1205 {0},
1205}; 1206};
1206MODULE_DEVICE_TABLE(usb, af9015_usb_table); 1207MODULE_DEVICE_TABLE(usb, af9015_usb_table);
@@ -1353,7 +1354,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1353 1354
1354 .i2c_algo = &af9015_i2c_algo, 1355 .i2c_algo = &af9015_i2c_algo,
1355 1356
1356 .num_device_descs = 6, 1357 .num_device_descs = 7,
1357 .devices = { 1358 .devices = {
1358 { 1359 {
1359 .name = "Xtensions XD-380", 1360 .name = "Xtensions XD-380",
@@ -1385,6 +1386,12 @@ static struct dvb_usb_device_properties af9015_properties[] = {
1385 .cold_ids = {&af9015_usb_table[15], NULL}, 1386 .cold_ids = {&af9015_usb_table[15], NULL},
1386 .warm_ids = {NULL}, 1387 .warm_ids = {NULL},
1387 }, 1388 },
1389 {
1390 .name = "KWorld USB DVB-T TV Stick II " \
1391 "(VS-DVB-T 395U)",
1392 .cold_ids = {&af9015_usb_table[16], NULL},
1393 .warm_ids = {NULL},
1394 },
1388 } 1395 }
1389 } 1396 }
1390}; 1397};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 7380b94b3b36..a4fca3fca5ee 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -96,6 +96,7 @@
96#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0 96#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0
97#define USB_PID_GRANDTEC_DVBT_USB_WARM 0x0fa1 97#define USB_PID_GRANDTEC_DVBT_USB_WARM 0x0fa1
98#define USB_PID_KWORLD_399U 0xe399 98#define USB_PID_KWORLD_399U 0xe399
99#define USB_PID_KWORLD_395U 0xe396
99#define USB_PID_KWORLD_PC160_2T 0xc160 100#define USB_PID_KWORLD_PC160_2T 0xc160
100#define USB_PID_KWORLD_VSTREAM_COLD 0x17de 101#define USB_PID_KWORLD_VSTREAM_COLD 0x17de
101#define USB_PID_KWORLD_VSTREAM_WARM 0x17df 102#define USB_PID_KWORLD_VSTREAM_WARM 0x17df