Commit ddf12227 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6606): saa7134: add autodetection support for alternate subids of Hauppauge HVR1110 



Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a82200fb

Documentation/video4linux/CARDLIST.saa7134

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ 
101 -> Pinnacle PCTV 310i                       [11bd:002f]

102 -> Avermedia AVerTV Studio 507              [1461:9715]

103 -> Compro Videomate DVB-T200A

104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid     [0070:6701]

104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid     [0070:6700,0070:6701,0070:6702,0070:6703,0070:6704,0070:6705]

105 -> Terratec Cinergy HT PCMCIA               [153b:1172]

106 -> Encore ENLTV                             [1131:2342,1131:2341,3016:2344]

107 -> Encore ENLTV-FM                          [1131:230f]

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

+30 −0
Original line number Diff line number Diff line
@@ -4203,12 +4203,42 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x1043,

		.subdevice    = 0x4876,

		.driver_data  = SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6700,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1110,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6701,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1110,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6702,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1110,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6703,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1110,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6704,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1110,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x0070,

		.subdevice    = 0x6705,

		.driver_data  = SAA7134_BOARD_HAUPPAUGE_HVR1110,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,