Commit ad9b4bb2 authored Mar 13, 2011 by Devin Heitmueller Committed by Mauro Carvalho Chehab May 20, 2011

[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>

parent 09bc1942

drivers/media/video/em28xx/em28xx-cards.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1463,6 +1463,8 @@ struct em28xx_board em28xx_boards[] = {
	.tuner_type = TUNER_XC2028,		.tuner_type = TUNER_XC2028,
	.tuner_gpio = default_tuner_gpio,		.tuner_gpio = default_tuner_gpio,
	.mts_firmware = 1,		.mts_firmware = 1,
			.has_dvb = 1,
			.dvb_gpio = hauppauge_wintv_hvr_900R2_digital,
	.decoder = EM28XX_TVP5150,		.decoder = EM28XX_TVP5150,
	.input = { {		.input = { {
	.type = EM28XX_VMUX_TELEVISION,		.type = EM28XX_VMUX_TELEVISION,
	@@ -2238,6 +2240,7 @@ static void em28xx_setup_xc3028(struct em28xx dev, struct xc2028_ctrl ctl)
	ctl->demod = XC3028_FE_ZARLINK456;		ctl->demod = XC3028_FE_ZARLINK456;
	break;		break;
	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:		case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
			case EM2882_BOARD_PINNACLE_HYBRID_PRO_330E:
	ctl->demod = XC3028_FE_DEFAULT;		ctl->demod = XC3028_FE_DEFAULT;
	break;		break;
	case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:		case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:

drivers/media/video/em28xx/em28xx-dvb.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -590,6 +590,7 @@ static int dvb_init(struct em28xx *dev)
	}		}
	break;		break;
	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:		case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:
			case EM2882_BOARD_PINNACLE_HYBRID_PRO_330E:
	dvb->frontend = dvb_attach(drxd_attach, &em28xx_drxd, NULL,		dvb->frontend = dvb_attach(drxd_attach, &em28xx_drxd, NULL,
	&dev->i2c_adap, &dev->udev->dev);		&dev->i2c_adap, &dev->udev->dev);
	if (attach_xc3028(0x61, dev) < 0) {		if (attach_xc3028(0x61, dev) < 0) {