diff options
| author | Gerd Knorr <devnull@localhost> | 2004-12-14 15:33:29 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-12-14 15:33:29 +0000 |
| commit | 2da7a0afdf8aeed1b67089ac06bc38b283d236df (patch) | |
| tree | bc239659237af4e808049f21dec1c7ca633700d8 /linux/drivers/media/video/saa7134 | |
| parent | 67f890d8c41c18f014b67fc1e08c9ebcd67023f8 (diff) | |
| download | mediapointer-dvb-s2-2da7a0afdf8aeed1b67089ac06bc38b283d236df.tar.gz mediapointer-dvb-s2-2da7a0afdf8aeed1b67089ac06bc38b283d236df.tar.bz2 | |
- switch over to tveeprom for hauppauge card config.
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 34 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 |
2 files changed, 35 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 02c17edd5..c90f0b912 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,6 +1,6 @@ /* - * $Id: saa7134-cards.c,v 1.45 2004/12/09 12:51:35 kraxel Exp $ + * $Id: saa7134-cards.c,v 1.46 2004/12/14 15:33:30 kraxel Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -1379,6 +1379,32 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE2, }}, }, + [SAA7134_BOARD_PROVIDEO_PV952] = { + /* andreas.kretschmer@web.de */ + .name = "ProVideo PV952", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, + .tda9887_conf = TDA9887_PRESENT, + .inputs = {{ + .name = name_comp1, + .vmux = 0, + .amux = LINE1, + },{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .tv = 1, + },{ + .name = name_tv_mono, + .vmux = 1, + .amux = LINE2, + .tv = 1, + }}, + .radio = { + .name = name_radio, + .amux = LINE2, + }, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -1656,6 +1682,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = PCI_VENDOR_ID_PHILIPS, .subdevice = 0, .driver_data = SAA7134_BOARD_NOAUTO, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7134, + .subvendor = 0x1540, + .subdevice = 0x9524, + .driver_data = SAA7134_BOARD_PROVIDEO_PV952, },{ /* --- default catch --- */ diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 29b041093..bab2b7575 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.33 2004/12/09 12:51:35 kraxel Exp $ + * $Id: saa7134.h,v 1.34 2004/12/14 15:33:30 kraxel Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -192,6 +192,7 @@ struct saa7134_format { #define SAA7134_BOARD_CINERGY600_MK3 48 #define SAA7134_BOARD_VIDEOMATE_GOLD_PLUS 49 #define SAA7134_BOARD_PINNACLE_300I_DVBT_PAL 50 +#define SAA7134_BOARD_PROVIDEO_PV952 51 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 |