diff options
author | Dmitri Belimov <d.belimov@gmail.com> | 2009-12-21 00:00:38 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:32 -0500 |
commit | 9c6f97a02358c78ed1db69cde702db263bc62cf6 (patch) | |
tree | 5affc52700bc12a109cba11336adb35a3432acdc /drivers/media/video/saa7134/saa7134-cards.c | |
parent | 7de0b8739f9b7856d2c3aa96e50e851283eeb24a (diff) |
V4L/DVB (13945): Add lost config and PCI ID for card of Beholder
Add lost configuration for our TV card.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 03f572708b85..4c76db1efd04 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -4160,7 +4160,7 @@ struct saa7134_board saa7134_boards[] = { | |||
4160 | .amux = LINE2, | 4160 | .amux = LINE2, |
4161 | }, | 4161 | }, |
4162 | }, | 4162 | }, |
4163 | [SAA7134_BOARD_BEHOLD_505RDS] = { | 4163 | [SAA7134_BOARD_BEHOLD_505RDS_MK5] = { |
4164 | /* Beholder Intl. Ltd. 2008 */ | 4164 | /* Beholder Intl. Ltd. 2008 */ |
4165 | /*Dmitry Belimov <d.belimov@gmail.com> */ | 4165 | /*Dmitry Belimov <d.belimov@gmail.com> */ |
4166 | .name = "Beholder BeholdTV 505 RDS", | 4166 | .name = "Beholder BeholdTV 505 RDS", |
@@ -5320,6 +5320,41 @@ struct saa7134_board saa7134_boards[] = { | |||
5320 | .vmux = 8, | 5320 | .vmux = 8, |
5321 | } }, | 5321 | } }, |
5322 | }, | 5322 | }, |
5323 | [SAA7134_BOARD_BEHOLD_505RDS_MK3] = { | ||
5324 | /* Beholder Intl. Ltd. 2008 */ | ||
5325 | /*Dmitry Belimov <d.belimov@gmail.com> */ | ||
5326 | .name = "Beholder BeholdTV 505 RDS", | ||
5327 | .audio_clock = 0x00200000, | ||
5328 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
5329 | .radio_type = UNSET, | ||
5330 | .tuner_addr = ADDR_UNSET, | ||
5331 | .radio_addr = ADDR_UNSET, | ||
5332 | .rds_addr = 0x10, | ||
5333 | .tda9887_conf = TDA9887_PRESENT, | ||
5334 | .gpiomask = 0x00008000, | ||
5335 | .inputs = {{ | ||
5336 | .name = name_tv, | ||
5337 | .vmux = 3, | ||
5338 | .amux = LINE2, | ||
5339 | .tv = 1, | ||
5340 | }, { | ||
5341 | .name = name_comp1, | ||
5342 | .vmux = 1, | ||
5343 | .amux = LINE1, | ||
5344 | }, { | ||
5345 | .name = name_svideo, | ||
5346 | .vmux = 8, | ||
5347 | .amux = LINE1, | ||
5348 | } }, | ||
5349 | .mute = { | ||
5350 | .name = name_mute, | ||
5351 | .amux = LINE1, | ||
5352 | }, | ||
5353 | .radio = { | ||
5354 | .name = name_radio, | ||
5355 | .amux = LINE2, | ||
5356 | }, | ||
5357 | }, | ||
5323 | 5358 | ||
5324 | }; | 5359 | }; |
5325 | 5360 | ||
@@ -6235,7 +6270,13 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
6235 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | 6270 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, |
6236 | .subvendor = 0x0000, | 6271 | .subvendor = 0x0000, |
6237 | .subdevice = 0x505B, | 6272 | .subdevice = 0x505B, |
6238 | .driver_data = SAA7134_BOARD_BEHOLD_505RDS, | 6273 | .driver_data = SAA7134_BOARD_BEHOLD_505RDS_MK5, |
6274 | }, { | ||
6275 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
6276 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | ||
6277 | .subvendor = 0x0000, | ||
6278 | .subdevice = 0x5051, | ||
6279 | .driver_data = SAA7134_BOARD_BEHOLD_505RDS_MK3, | ||
6239 | },{ | 6280 | },{ |
6240 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6281 | .vendor = PCI_VENDOR_ID_PHILIPS, |
6241 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | 6282 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, |
@@ -6792,7 +6833,8 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
6792 | case SAA7134_BOARD_BEHOLD_407FM: | 6833 | case SAA7134_BOARD_BEHOLD_407FM: |
6793 | case SAA7134_BOARD_BEHOLD_409: | 6834 | case SAA7134_BOARD_BEHOLD_409: |
6794 | case SAA7134_BOARD_BEHOLD_505FM: | 6835 | case SAA7134_BOARD_BEHOLD_505FM: |
6795 | case SAA7134_BOARD_BEHOLD_505RDS: | 6836 | case SAA7134_BOARD_BEHOLD_505RDS_MK5: |
6837 | case SAA7134_BOARD_BEHOLD_505RDS_MK3: | ||
6796 | case SAA7134_BOARD_BEHOLD_507_9FM: | 6838 | case SAA7134_BOARD_BEHOLD_507_9FM: |
6797 | case SAA7134_BOARD_BEHOLD_507RDS_MK3: | 6839 | case SAA7134_BOARD_BEHOLD_507RDS_MK3: |
6798 | case SAA7134_BOARD_BEHOLD_507RDS_MK5: | 6840 | case SAA7134_BOARD_BEHOLD_507RDS_MK5: |