aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
authorUroš Vampl <mobile.leecher@gmail.com>2009-09-30 21:53:37 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:40:14 -0500
commitec994d0505fc3dde5f46203602c76b527e2ac69d (patch)
tree521b8444244fa8291f1f3ea21f5c6aaade5ef414 /drivers/media/video/em28xx/em28xx-cards.c
parentf91cb65b94114f30cf43738ff923f272e4f2ae13 (diff)
V4L/DVB (13078): em28xx: fix support for Terratec Cinergy T XS (005e)
Make analog audio, dvb and the remote work on a Terratec Cinergy Hybrid XS (em2882). Note by djh: Thanks go out fo Andrej Suligoi for his contribution in providing and testing pretty much the exact same patch as provided by Uros. Between the two of them, they got all the core functionality working for the device. Cc: Andrej Suligoi <suligoi@gmail.com> Signed-off-by: Uroš Vampl <mobile.leecher@gmail.com> Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index a41256f78d6a..4cfaa83b64d9 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1384,7 +1384,12 @@ struct em28xx_board em28xx_boards[] = {
1384 .valid = EM28XX_BOARD_NOT_VALIDATED, 1384 .valid = EM28XX_BOARD_NOT_VALIDATED,
1385 .tuner_type = TUNER_XC2028, 1385 .tuner_type = TUNER_XC2028,
1386 .tuner_gpio = default_tuner_gpio, 1386 .tuner_gpio = default_tuner_gpio,
1387 .mts_firmware = 1,
1387 .decoder = EM28XX_TVP5150, 1388 .decoder = EM28XX_TVP5150,
1389 .has_dvb = 1,
1390 .dvb_gpio = hauppauge_wintv_hvr_900_digital,
1391 .ir_codes = &ir_codes_terratec_cinergy_xs_table,
1392 .xclk = EM28XX_XCLK_FREQUENCY_12MHZ,
1388 .input = { { 1393 .input = { {
1389 .type = EM28XX_VMUX_TELEVISION, 1394 .type = EM28XX_VMUX_TELEVISION,
1390 .vmux = TVP5150_COMPOSITE0, 1395 .vmux = TVP5150_COMPOSITE0,
@@ -2052,6 +2057,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl)
2052 switch (dev->model) { 2057 switch (dev->model) {
2053 case EM2880_BOARD_EMPIRE_DUAL_TV: 2058 case EM2880_BOARD_EMPIRE_DUAL_TV:
2054 case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900: 2059 case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
2060 case EM2882_BOARD_TERRATEC_HYBRID_XS:
2055 ctl->demod = XC3028_FE_ZARLINK456; 2061 ctl->demod = XC3028_FE_ZARLINK456;
2056 break; 2062 break;
2057 case EM2880_BOARD_TERRATEC_HYBRID_XS: 2063 case EM2880_BOARD_TERRATEC_HYBRID_XS: