Commit b39423a9 authored by Simon Farnsworth's avatar Simon Farnsworth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5580): Add support for three cards to saa7134 driver 



Add support for the "Elitegroup ECS TVP3XP FM1246", the "KWorld DVB-T
210", and the Animation Technologies LR214 Rev F onwards (SAA7131) to
the saa7134 driver.
Also rename the LR214WF to the LR214 Rev E or ealier (SAA7135), to match
what we've seen on boards in the field.
Changed the comment on the Lifeview cards to indicate Rev E and earlier
versus Rev F and later, together with a chip indicator, following
feedback from Peter Missel <peter.missel@onlinehome.de>.

Signed-off-by: default avatarSimon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 4d845170

Documentation/video4linux/CARDLIST.saa7134

+3 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
 51 -> ProVideo PV952                           [1540:9524]

 52 -> AverMedia AverTV/305                     [1461:2108]

 53 -> ASUS TV-FM 7135                          [1043:4845]

 54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,1489:0214,5168:0304]

 54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,5168:5214,1489:0214,5168:0304]

 55 -> LifeView FlyDVB-T DUO / MSI TV@nywhere Duo [5168:0306,4E42:0306]

 56 -> Avermedia AVerTV 307                     [1461:a70a]

 57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
@@ -111,3 +111,5 @@ 
110 -> Avermedia M102                           [1461:f31e]

111 -> ASUS P7131 4871                          [1043:4871]

112 -> ASUSTeK P7131 Hybrid                     [1043:4876]

113 -> Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM) [1019:4cb6]

114 -> KWorld DVB-T 210                         [17de:7250]

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

+86 −1
Original line number Diff line number Diff line
@@ -1170,6 +1170,42 @@ struct saa7134_board saa7134_boards[] = { 
			.amux   = LINE2,

		},

	},

    [SAA7134_BOARD_ECS_TVP3XP_4CB6] = {

		/* Barry Scott <barry.scott@onelan.co.uk> */

		.name		= "Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM)",

		.audio_clock    = 0x187de7,

		.tuner_type     = TUNER_PHILIPS_PAL_I,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.inputs         = {{

			.name   = name_tv,

			.vmux   = 1,

			.amux   = TV,

			.tv     = 1,

		},{

			.name   = name_tv_mono,

			.vmux   = 1,

			.amux   = LINE2,

			.tv     = 1,

		},{

			.name   = name_comp1,

			.vmux   = 3,

			.amux   = LINE1,

		},{

			.name   = name_svideo,

			.vmux   = 8,

			.amux   = LINE1,

		},{

			.name   = "CVid over SVid",

			.vmux   = 0,

			.amux   = LINE1,

		}},

		.radio = {

			.name   = name_radio,

			.amux   = LINE2,

		},

	},

	[SAA7134_BOARD_AVACSSMARTTV] = {

		/* Roman Pszonczenko <romka@kolos.math.uni.lodz.pl> */

		.name           = "AVACS SmartTV",
@@ -2754,6 +2790,35 @@ struct saa7134_board saa7134_boards[] = { 
			.amux   = LINE1,

		},

	},

	[SAA7134_BOARD_KWORLD_DVBT_210] = {

		.name           = "KWorld DVB-T 210",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_TDA8290,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.mpeg           = SAA7134_MPEG_DVB,

		.gpiomask       = 1 << 21,

		.inputs = {{

			.name   = name_tv,

			.vmux   = 1,

			.amux   = TV,

			.tv     = 1,

		},{

			.name   = name_comp1,

			.vmux   = 3,

			.amux   = LINE1,

		},{

			.name   = name_svideo,

			.vmux   = 8,

			.amux   = LINE1,

		}},

		.radio = {

			.name   = name_radio,

			.amux   = TV,

			.gpio   = 0x0200000,

		},

	},

	[SAA7134_BOARD_KWORLD_ATSC110] = {

		.name           = "Kworld ATSC110",

		.audio_clock    = 0x00187de7,
@@ -3515,7 +3580,13 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5168,	/* Animation Technologies (LifeView) */

		.subdevice    = 0x0214, /* Standard PCI, LR214WF */

		.subdevice    = 0x0214, /* Standard PCI, LR214 Rev E and earlier (SAA7135) */

		.driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5168,	/* Animation Technologies (LifeView) */

		.subdevice    = 0x5214, /* Standard PCI, LR214 Rev F onwards (SAA7131) */

		.driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3687,6 +3758,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x1019,

		.subdevice    = 0x4cb5,

		.driver_data  = SAA7134_BOARD_ECS_TVP3XP_4CB5,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,

		.subvendor    = 0x1019,

		.subdevice    = 0x4cb6,

		.driver_data  = SAA7134_BOARD_ECS_TVP3XP_4CB6,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -3913,6 +3990,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x17de,

		.subdevice    = 0x7201,

		.driver_data  = SAA7134_BOARD_TEVION_DVBT_220RF,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x17de,

		.subdevice    = 0x7250,

		.driver_data  = SAA7134_BOARD_KWORLD_DVBT_210,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
@@ -4178,6 +4261,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_CINERGY600_MK3:

	case SAA7134_BOARD_ECS_TVP3XP:

	case SAA7134_BOARD_ECS_TVP3XP_4CB5:

	case SAA7134_BOARD_ECS_TVP3XP_4CB6:

	case SAA7134_BOARD_MD2819:

	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_KWORLD_XPERT:
@@ -4426,6 +4510,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
		}

		break;

	case SAA7134_BOARD_PINNACLE_PCTV_310i:

	case SAA7134_BOARD_KWORLD_DVBT_210:

	case SAA7134_BOARD_TEVION_DVBT_220RF:

	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:

	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:

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

+17 −0
Original line number Diff line number Diff line
@@ -887,6 +887,20 @@ static struct tda1004x_config asus_p7131_hybrid_lna_config = { 
	.antenna_switch= 2,

	.request_firmware = philips_tda1004x_request_firmware

};

static struct tda1004x_config kworld_dvb_t_210_config = {

	.demod_address = 0x08,

	.invert        = 1,

	.invert_oclk   = 0,

	.xtal_freq     = TDA10046_XTAL_16M,

	.agc_config    = TDA10046_AGC_TDA827X,

	.gpio_config   = TDA10046_GP11_I,

	.if_freq       = TDA10046_FREQ_045,

	.i2c_gate      = 0x4b,

	.tuner_address = 0x61,

	.tuner_config  = 2,

	.antenna_switch= 1,

	.request_firmware = philips_tda1004x_request_firmware

};

/* ------------------------------------------------------------------

 * special case: this card uses saa713x GPIO22 for the mode switch

 */
@@ -1039,6 +1053,9 @@ static int dvb_init(struct saa7134_dev *dev) 
			dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;

		}

		break;

	case SAA7134_BOARD_KWORLD_DVBT_210:

		configure_tda827x_fe(dev, &kworld_dvb_t_210_config);

		break;

	case SAA7134_BOARD_PHILIPS_TIGER:

		configure_tda827x_fe(dev, &philips_tiger_config);

		break;

drivers/media/video/saa7134/saa7134.h

+2 −0
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ struct saa7134_format { 
#define SAA7134_BOARD_AVERMEDIA_M102	   110

#define SAA7134_BOARD_ASUS_P7131_4871	   111

#define SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA 112

#define SAA7134_BOARD_ECS_TVP3XP_4CB6  113

#define SAA7134_BOARD_KWORLD_DVBT_210 114



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8

CRA Git | Maintained and supported by SUSTech CRA and CCSE