diff options
author | Olli Salonen <olli.salonen@iki.fi> | 2014-11-24 01:57:34 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-25 06:13:10 -0500 |
commit | fc30dd7647e502b757c47c2a1b7163face9e0272 (patch) | |
tree | 755d1568c996f88c44303195d1477e9f21c9fdae /drivers/media/usb/em28xx/em28xx-cards.c | |
parent | 073f38494ab9bad6edf589c74a1f09c358c5068c (diff) |
[media] em28xx: Add support for Terratec Cinergy T2 Stick HD
Terratec Cinergy T2 Stick HD [eb1a:8179] is a USB DVB-T/T2/C tuner that
contains following components:
* Empia EM28178 USB bridge
* Silicon Labs Si2168-A30 demodulator
* Silicon Labs Si2146-A10 tuner
I don't have the remote, so the RC_MAP is a best guess based on the pictures of
the remote controllers and other supported Terratec devices with a similar
remote.
[Antti: Resolved conflict caused by Leadtek VC100 patch]
Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 3c97bf106442..5f747a5e2463 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c | |||
@@ -479,6 +479,20 @@ static struct em28xx_reg_seq pctv_292e[] = { | |||
479 | {-1, -1, -1, -1}, | 479 | {-1, -1, -1, -1}, |
480 | }; | 480 | }; |
481 | 481 | ||
482 | static struct em28xx_reg_seq terratec_t2_stick_hd[] = { | ||
483 | {EM2874_R80_GPIO_P0_CTRL, 0xff, 0xff, 0}, | ||
484 | {0x0d, 0xff, 0xff, 600}, | ||
485 | {EM2874_R80_GPIO_P0_CTRL, 0xfc, 0xff, 10}, | ||
486 | {EM2874_R80_GPIO_P0_CTRL, 0xbc, 0xff, 100}, | ||
487 | {EM2874_R80_GPIO_P0_CTRL, 0xfc, 0xff, 100}, | ||
488 | {EM2874_R80_GPIO_P0_CTRL, 0x00, 0xff, 300}, | ||
489 | {EM2874_R80_GPIO_P0_CTRL, 0xf8, 0xff, 100}, | ||
490 | {EM2874_R80_GPIO_P0_CTRL, 0xfc, 0xff, 300}, | ||
491 | {0x0d, 0x42, 0xff, 1000}, | ||
492 | {EM2874_R5F_TS_ENABLE, 0x85, 0xff, 0}, | ||
493 | {-1, -1, -1, -1}, | ||
494 | }; | ||
495 | |||
482 | /* | 496 | /* |
483 | * Button definitions | 497 | * Button definitions |
484 | */ | 498 | */ |
@@ -2257,6 +2271,17 @@ struct em28xx_board em28xx_boards[] = { | |||
2257 | .amux = EM28XX_AMUX_LINE_IN, | 2271 | .amux = EM28XX_AMUX_LINE_IN, |
2258 | } }, | 2272 | } }, |
2259 | }, | 2273 | }, |
2274 | /* eb1a:8179 Terratec Cinergy T2 Stick HD. | ||
2275 | * Empia EM28178, Silicon Labs Si2168, Silicon Labs Si2146 */ | ||
2276 | [EM28178_BOARD_TERRATEC_T2_STICK_HD] = { | ||
2277 | .name = "Terratec Cinergy T2 Stick HD", | ||
2278 | .def_i2c_bus = 1, | ||
2279 | .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_FREQ_400_KHZ, | ||
2280 | .tuner_type = TUNER_ABSENT, | ||
2281 | .tuner_gpio = terratec_t2_stick_hd, | ||
2282 | .has_dvb = 1, | ||
2283 | .ir_codes = RC_MAP_TERRATEC_SLIM_2, | ||
2284 | }, | ||
2260 | }; | 2285 | }; |
2261 | EXPORT_SYMBOL_GPL(em28xx_boards); | 2286 | EXPORT_SYMBOL_GPL(em28xx_boards); |
2262 | 2287 | ||
@@ -2440,6 +2465,8 @@ struct usb_device_id em28xx_id_table[] = { | |||
2440 | .driver_info = EM28178_BOARD_PCTV_292E }, | 2465 | .driver_info = EM28178_BOARD_PCTV_292E }, |
2441 | { USB_DEVICE(0x0413, 0x6f07), | 2466 | { USB_DEVICE(0x0413, 0x6f07), |
2442 | .driver_info = EM2861_BOARD_LEADTEK_VC100 }, | 2467 | .driver_info = EM2861_BOARD_LEADTEK_VC100 }, |
2468 | { USB_DEVICE(0xeb1a, 0x8179), | ||
2469 | .driver_info = EM28178_BOARD_TERRATEC_T2_STICK_HD }, | ||
2443 | { }, | 2470 | { }, |
2444 | }; | 2471 | }; |
2445 | MODULE_DEVICE_TABLE(usb, em28xx_id_table); | 2472 | MODULE_DEVICE_TABLE(usb, em28xx_id_table); |