diff options
| author | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2006-10-03 14:46:10 +0200 |
|---|---|---|
| committer | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2006-10-03 14:46:10 +0200 |
| commit | 3644bb03d6e6c59d33d18128ba3b3f947dacbf7a (patch) | |
| tree | e4ffc07a59a573227e6afacd5aff6ee6a4be5e58 /linux/drivers/media/video/saa7134/saa7134-cards.c | |
| parent | 8bbbc4f1fda80e8554884edefdb3e379f04c4cb9 (diff) | |
| parent | aa93beda78456b2dc3404cfce3d55234677ffedc (diff) | |
| download | mediapointer-dvb-s2-3644bb03d6e6c59d33d18128ba3b3f947dacbf7a.tar.gz mediapointer-dvb-s2-3644bb03d6e6c59d33d18128ba3b3f947dacbf7a.tar.bz2 | |
Merge with master repository
From: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index d6850d5bd..8abd7cfe0 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -3034,6 +3034,34 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE1, }, }, + [SAA7134_BOARD_ASUS_EUROPA2_HYBRID] = { + .name = "Asus Europa2 OEM", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .tda9887_conf = TDA9887_PRESENT| TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE, + .mpeg = SAA7134_MPEG_DVB, + .inputs = {{ + .name = name_tv, + .vmux = 3, + .amux = TV, + .tv = 1, + },{ + .name = name_comp1, + .vmux = 4, + .amux = LINE2, + },{ + .name = name_svideo, + .vmux = 8, + .amux = LINE2, + }}, + .radio = { + .name = name_radio, + .amux = LINE1, + }, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -3637,6 +3665,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subdevice = 0x2c00, .driver_data = SAA7134_BOARD_AVERMEDIA_A16AR, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7134, + .subvendor = 0x1043, + .subdevice = 0x4860, + .driver_data = SAA7134_BOARD_ASUS_EUROPA2_HYBRID, + },{ /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, @@ -3948,6 +3982,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) break; case SAA7134_BOARD_PHILIPS_EUROPA: case SAA7134_BOARD_VIDEOMATE_DVBT_300: + case SAA7134_BOARD_ASUS_EUROPA2_HYBRID: /* The Philips EUROPA based hybrid boards have the tuner connected through * the channel decoder. We have to make it transparent to find it */ |