diff options
author | Olli Salonen <olli.salonen@iki.fi> | 2016-03-02 06:06:06 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 12:36:36 -0500 |
commit | 6ede20f9683c55dac8281b63d80b5cc669640252 (patch) | |
tree | 37a3183c9358674173fb2db1abaacb438b651123 /drivers/media | |
parent | 6060421368c6efdc974f8d6d5435c166ccc0dc63 (diff) |
[media] dw2102: add support for TeVii S662
TeVii S662 is a USB 2.0 DVB-S2 tuner that's identical to TechnoTrend
S2-4600 tuner. Add the USB ID to dw2102 driver.
Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/usb/dvb-usb/dw2102.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c index a14a1973b80c..6d0dd859d684 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c | |||
@@ -1,9 +1,10 @@ | |||
1 | /* DVB USB framework compliant Linux driver for the | 1 | /* DVB USB framework compliant Linux driver for the |
2 | * DVBWorld DVB-S 2101, 2102, DVB-S2 2104, DVB-C 3101, | 2 | * DVBWorld DVB-S 2101, 2102, DVB-S2 2104, DVB-C 3101, |
3 | * TeVii S600, S630, S650, S660, S480, S421, S632 | 3 | * TeVii S421, S480, S482, S600, S630, S632, S650, S660, S662, |
4 | * Prof 1100, 7500, | 4 | * Prof 1100, 7500, |
5 | * Geniatech SU3000, T220, | 5 | * Geniatech SU3000, T220, |
6 | * TechnoTrend S2-4600 Cards | 6 | * TechnoTrend S2-4600, |
7 | * Terratec Cinergy S2 cards | ||
7 | * Copyright (C) 2008-2012 Igor M. Liplianin (liplianin@me.by) | 8 | * Copyright (C) 2008-2012 Igor M. Liplianin (liplianin@me.by) |
8 | * | 9 | * |
9 | * This program is free software; you can redistribute it and/or modify it | 10 | * This program is free software; you can redistribute it and/or modify it |
@@ -65,6 +66,10 @@ | |||
65 | #define USB_PID_TEVII_S660 0xd660 | 66 | #define USB_PID_TEVII_S660 0xd660 |
66 | #endif | 67 | #endif |
67 | 68 | ||
69 | #ifndef USB_PID_TEVII_S662 | ||
70 | #define USB_PID_TEVII_S662 0xd662 | ||
71 | #endif | ||
72 | |||
68 | #ifndef USB_PID_TEVII_S480_1 | 73 | #ifndef USB_PID_TEVII_S480_1 |
69 | #define USB_PID_TEVII_S480_1 0xd481 | 74 | #define USB_PID_TEVII_S480_1 0xd481 |
70 | #endif | 75 | #endif |
@@ -1696,6 +1701,7 @@ enum dw2102_table_entry { | |||
1696 | TEVII_S482_1, | 1701 | TEVII_S482_1, |
1697 | TEVII_S482_2, | 1702 | TEVII_S482_2, |
1698 | TERRATEC_CINERGY_S2_BOX, | 1703 | TERRATEC_CINERGY_S2_BOX, |
1704 | TEVII_S662 | ||
1699 | }; | 1705 | }; |
1700 | 1706 | ||
1701 | static struct usb_device_id dw2102_table[] = { | 1707 | static struct usb_device_id dw2102_table[] = { |
@@ -1724,6 +1730,7 @@ static struct usb_device_id dw2102_table[] = { | |||
1724 | [TEVII_S482_1] = {USB_DEVICE(0x9022, 0xd483)}, | 1730 | [TEVII_S482_1] = {USB_DEVICE(0x9022, 0xd483)}, |
1725 | [TEVII_S482_2] = {USB_DEVICE(0x9022, 0xd484)}, | 1731 | [TEVII_S482_2] = {USB_DEVICE(0x9022, 0xd484)}, |
1726 | [TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC, 0x0105)}, | 1732 | [TERRATEC_CINERGY_S2_BOX] = {USB_DEVICE(USB_VID_TERRATEC, 0x0105)}, |
1733 | [TEVII_S662] = {USB_DEVICE(0x9022, USB_PID_TEVII_S662)}, | ||
1727 | { } | 1734 | { } |
1728 | }; | 1735 | }; |
1729 | 1736 | ||
@@ -2241,7 +2248,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = { | |||
2241 | } }, | 2248 | } }, |
2242 | } | 2249 | } |
2243 | }, | 2250 | }, |
2244 | .num_device_descs = 4, | 2251 | .num_device_descs = 5, |
2245 | .devices = { | 2252 | .devices = { |
2246 | { "TechnoTrend TT-connect S2-4600", | 2253 | { "TechnoTrend TT-connect S2-4600", |
2247 | { &dw2102_table[TECHNOTREND_S2_4600], NULL }, | 2254 | { &dw2102_table[TECHNOTREND_S2_4600], NULL }, |
@@ -2259,6 +2266,10 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = { | |||
2259 | { &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL }, | 2266 | { &dw2102_table[TERRATEC_CINERGY_S2_BOX], NULL }, |
2260 | { NULL }, | 2267 | { NULL }, |
2261 | }, | 2268 | }, |
2269 | { "TeVii S662", | ||
2270 | { &dw2102_table[TEVII_S662], NULL }, | ||
2271 | { NULL }, | ||
2272 | }, | ||
2262 | } | 2273 | } |
2263 | }; | 2274 | }; |
2264 | 2275 | ||
@@ -2379,10 +2390,10 @@ module_usb_driver(dw2102_driver); | |||
2379 | MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by"); | 2390 | MODULE_AUTHOR("Igor M. Liplianin (c) liplianin@me.by"); |
2380 | MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104," | 2391 | MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104," |
2381 | " DVB-C 3101 USB2.0," | 2392 | " DVB-C 3101 USB2.0," |
2382 | " TeVii S600, S630, S650, S660, S480, S421, S632" | 2393 | " TeVii S421, S480, S482, S600, S630, S632, S650," |
2383 | " Prof 1100, 7500 USB2.0," | 2394 | " TeVii S660, S662, Prof 1100, 7500 USB2.0," |
2384 | " Geniatech SU3000, T220," | 2395 | " Geniatech SU3000, T220," |
2385 | " TechnoTrend S2-4600 devices"); | 2396 | " TechnoTrend S2-4600, Terratec Cinergy S2 devices"); |
2386 | MODULE_VERSION("0.1"); | 2397 | MODULE_VERSION("0.1"); |
2387 | MODULE_LICENSE("GPL"); | 2398 | MODULE_LICENSE("GPL"); |
2388 | MODULE_FIRMWARE(DW2101_FIRMWARE); | 2399 | MODULE_FIRMWARE(DW2101_FIRMWARE); |