diff options
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 6 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-dvb.c | 1 |
2 files changed, 7 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: |
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index db749461e5c6..19f5156f653e 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
@@ -493,6 +493,7 @@ static int dvb_init(struct em28xx *dev) | |||
493 | } | 493 | } |
494 | break; | 494 | break; |
495 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900: | 495 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900: |
496 | case EM2882_BOARD_TERRATEC_HYBRID_XS: | ||
496 | case EM2880_BOARD_EMPIRE_DUAL_TV: | 497 | case EM2880_BOARD_EMPIRE_DUAL_TV: |
497 | dvb->frontend = dvb_attach(zl10353_attach, | 498 | dvb->frontend = dvb_attach(zl10353_attach, |
498 | &em28xx_zl10353_xc3028_no_i2c_gate, | 499 | &em28xx_zl10353_xc3028_no_i2c_gate, |