diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 14b9ba4579b7..9210d3ea6942 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -5257,6 +5257,27 @@ struct saa7134_board saa7134_boards[] = { | |||
5257 | .amux = TV, | 5257 | .amux = TV, |
5258 | }, | 5258 | }, |
5259 | }, | 5259 | }, |
5260 | [SAA7134_BOARD_ZOLID_HYBRID_PCI] = { | ||
5261 | .name = "Zolid Hybrid TV Tuner PCI", | ||
5262 | .audio_clock = 0x00187de7, | ||
5263 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
5264 | .radio_type = UNSET, | ||
5265 | .tuner_addr = ADDR_UNSET, | ||
5266 | .radio_addr = ADDR_UNSET, | ||
5267 | .tuner_config = 0, | ||
5268 | .mpeg = SAA7134_MPEG_DVB, | ||
5269 | .ts_type = SAA7134_MPEG_TS_PARALLEL, | ||
5270 | .inputs = {{ | ||
5271 | .name = name_tv, | ||
5272 | .vmux = 1, | ||
5273 | .amux = TV, | ||
5274 | .tv = 1, | ||
5275 | } }, | ||
5276 | .radio = { /* untested */ | ||
5277 | .name = name_radio, | ||
5278 | .amux = TV, | ||
5279 | }, | ||
5280 | }, | ||
5260 | 5281 | ||
5261 | }; | 5282 | }; |
5262 | 5283 | ||
@@ -6390,6 +6411,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
6390 | .subdevice = 0x0138, /* LifeView FlyTV Prime30 OEM */ | 6411 | .subdevice = 0x0138, /* LifeView FlyTV Prime30 OEM */ |
6391 | .driver_data = SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM, | 6412 | .driver_data = SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM, |
6392 | }, { | 6413 | }, { |
6414 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
6415 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
6416 | .subvendor = PCI_VENDOR_ID_PHILIPS, | ||
6417 | .subdevice = 0x2004, | ||
6418 | .driver_data = SAA7134_BOARD_ZOLID_HYBRID_PCI, | ||
6419 | }, { | ||
6393 | /* --- boards without eeprom + subsystem ID --- */ | 6420 | /* --- boards without eeprom + subsystem ID --- */ |
6394 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6421 | .vendor = PCI_VENDOR_ID_PHILIPS, |
6395 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6422 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |