summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-12-09 12:51:35 +0000
committerGerd Knorr <devnull@localhost>2004-12-09 12:51:35 +0000
commit17d7470d78bd886cab06e6f0848bac4ac8edf1db (patch)
tree2e681fb9a605d3e2ba2feb0007aec272c8833431 /linux/drivers/media/video/saa7134/saa7134-cards.c
parent39aa684c82354e2c6c357eed2fd37c38f29c461f (diff)
downloadmediapointer-dvb-s2-17d7470d78bd886cab06e6f0848bac4ac8edf1db.tar.gz
mediapointer-dvb-s2-17d7470d78bd886cab06e6f0848bac4ac8edf1db.tar.bz2
- work on dvb pll stuff.
- misc dvb updates. - pinnacle 300i stuff (not working yet).
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c31
1 files changed, 28 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 493fcc84f..02c17edd5 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.44 2004/11/30 11:26:38 kraxel Exp $
+ * $Id: saa7134-cards.c,v 1.45 2004/12/09 12:51:35 kraxel Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -1354,6 +1354,31 @@ struct saa7134_board saa7134_boards[] = {
.gpio = 0x0c8000,
},
},
+ [SAA7134_BOARD_PINNACLE_300I_DVBT_PAL] = {
+ .name = "Pinnacle PCTV 300i DVB-T + PAL",
+ .audio_clock = 0x00187de7,
+ .tuner_type = TUNER_MT2032,
+ .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER,
+ .mpeg = SAA7134_MPEG_DVB,
+ .inputs = {{
+ .name = name_tv,
+ .vmux = 3,
+ .amux = TV,
+ .tv = 1,
+ },{
+ .name = name_comp1,
+ .vmux = 0,
+ .amux = LINE2,
+ },{
+ .name = name_comp2,
+ .vmux = 1,
+ .amux = LINE2,
+ },{
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE2,
+ }},
+ },
};
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -1565,8 +1590,8 @@ struct pci_device_id saa7134_pci_tbl[] = {
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = 0x11bd,
- .subdevice = 0x002d, /* 300i DVB-T + PAL */
- .driver_data = SAA7134_BOARD_PINNACLE_PCTV_STEREO,
+ .subdevice = 0x002d,
+ .driver_data = SAA7134_BOARD_PINNACLE_300I_DVBT_PAL,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,