diff options
author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2011-03-13 00:09:59 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 06:26:21 -0400 |
commit | ad9b4bb265cecbfc9b0c495741e331ce199964e0 (patch) | |
tree | c1e555d24f588bac14914d3a7932edd2ad484e4d /drivers/media/video/em28xx | |
parent | 09bc1942c031686bfcf897746b6baf9d42c92ed5 (diff) |
[media] em28xx: add digital support for PCTV 330e
Add the calls necessary to use the new drx-d driver for the PCTV 330e
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 3 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-dvb.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 99aa1fc148c..1b5dec2a84c 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -1463,6 +1463,8 @@ struct em28xx_board em28xx_boards[] = { | |||
1463 | .tuner_type = TUNER_XC2028, | 1463 | .tuner_type = TUNER_XC2028, |
1464 | .tuner_gpio = default_tuner_gpio, | 1464 | .tuner_gpio = default_tuner_gpio, |
1465 | .mts_firmware = 1, | 1465 | .mts_firmware = 1, |
1466 | .has_dvb = 1, | ||
1467 | .dvb_gpio = hauppauge_wintv_hvr_900R2_digital, | ||
1466 | .decoder = EM28XX_TVP5150, | 1468 | .decoder = EM28XX_TVP5150, |
1467 | .input = { { | 1469 | .input = { { |
1468 | .type = EM28XX_VMUX_TELEVISION, | 1470 | .type = EM28XX_VMUX_TELEVISION, |
@@ -2238,6 +2240,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl) | |||
2238 | ctl->demod = XC3028_FE_ZARLINK456; | 2240 | ctl->demod = XC3028_FE_ZARLINK456; |
2239 | break; | 2241 | break; |
2240 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2: | 2242 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2: |
2243 | case EM2882_BOARD_PINNACLE_HYBRID_PRO_330E: | ||
2241 | ctl->demod = XC3028_FE_DEFAULT; | 2244 | ctl->demod = XC3028_FE_DEFAULT; |
2242 | break; | 2245 | break; |
2243 | case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600: | 2246 | case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600: |
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index f18e41f0bbc..84120596d0e 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
@@ -590,6 +590,7 @@ static int dvb_init(struct em28xx *dev) | |||
590 | } | 590 | } |
591 | break; | 591 | break; |
592 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2: | 592 | case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2: |
593 | case EM2882_BOARD_PINNACLE_HYBRID_PRO_330E: | ||
593 | dvb->frontend = dvb_attach(drxd_attach, &em28xx_drxd, NULL, | 594 | dvb->frontend = dvb_attach(drxd_attach, &em28xx_drxd, NULL, |
594 | &dev->i2c_adap, &dev->udev->dev); | 595 | &dev->i2c_adap, &dev->udev->dev); |
595 | if (attach_xc3028(0x61, dev) < 0) { | 596 | if (attach_xc3028(0x61, dev) < 0) { |