diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-14 21:58:45 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-14 21:58:45 -0600 |
| commit | 1895621dbd8ab81d0545392d3b9dc64a9f3b4593 (patch) | |
| tree | e3eb7ee9b5f9d8341a1c4b2c0dc5f135f59b6ef6 /linux/drivers/media/video/saa7134/saa7134-cards.c | |
| parent | bb379778f6c9c6aa4dc340c342d5e81a0b9026dd (diff) | |
| parent | 49c7ae95a0e651f7e2186509d62e7eb21ff6154c (diff) | |
| download | mediapointer-dvb-s2-1895621dbd8ab81d0545392d3b9dc64a9f3b4593.tar.gz mediapointer-dvb-s2-1895621dbd8ab81d0545392d3b9dc64a9f3b4593.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index b2249665b..45eef4148 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -538,7 +538,7 @@ struct saa7134_board saa7134_boards[] = { .radio = { .name = name_radio, .amux = LINE2, - }, + }, }, [SAA7134_BOARD_MD7134] = { .name = "Medion 7134", @@ -2838,6 +2838,17 @@ struct saa7134_board saa7134_boards[] = { }, #endif }, + [SAA7134_BOARD_MD7134_BRIDGE_2] = { + /* This card has two saa7134 chips on it, + but only one of them is currently working. + The programming for the primary decoder is + in SAA7134_BOARD_MD7134 */ + .name = "Medion 7134 Bridge #2", + .audio_clock = 0x00187de7, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -3357,6 +3368,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subdevice = 0x6360, .driver_data = SAA7134_BOARD_AVERMEDIA_A169_B1, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7134, + .subvendor = 0x16be, + .subdevice = 0x0005, + .driver_data = SAA7134_BOARD_MD7134_BRIDGE_2, + },{ /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, @@ -3549,10 +3566,11 @@ int saa7134_board_init1(struct saa7134_dev *dev) dev->has_remote = SAA7134_REMOTE_I2C; break; case SAA7134_BOARD_AVERMEDIA_A169_B: - printk("%s: AVerMedia A169: dual saa7134 broadcast decoders\n" + case SAA7134_BOARD_MD7134_BRIDGE_2: + printk("%s: %s: dual saa713x broadcast decoders\n" "%s: Sorry, none of the inputs to this chip are supported yet.\n" "%s: Dual decoder functionality is disabled for now, use the other chip.\n", - dev->name,dev->name,dev->name); + dev->name,card(dev).name,dev->name,dev->name); break; } return 0; |