aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHermann Pitton <hermann-pitton@arcor.de>2008-01-20 17:42:01 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 09:14:56 -0500
commit728b92a2301c705dc36419ab0e7163b129462696 (patch)
treef4f13d76dcd1df86606bef8470e4588288856f75
parentad1ef131c35bb6967acd5ce3072a32ec1d27b482 (diff)
V4L/DVB (7084): saa7134: add support for the Medion / Creatix CTX948 card
This adds support for analog inputs and DVB-T. Good sensitivity for DVB-T currently needs to use analog TV first. DVB-S support is not yet completed, but is on the way. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 7a37594b7aa3..81566df13ae2 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -94,7 +94,7 @@
94 93 -> Medion 7134 Bridge #2 [16be:0005] 94 93 -> Medion 7134 Bridge #2 [16be:0005]
95 94 -> LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB [5168:3306,5168:3502,4e42:3502] 95 94 -> LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB [5168:3306,5168:3502,4e42:3502]
96 95 -> LifeView FlyVIDEO3000 (NTSC) [5169:0138] 96 95 -> LifeView FlyVIDEO3000 (NTSC) [5169:0138]
97 96 -> Medion Md8800 Quadro [16be:0007,16be:0008] 97 96 -> Medion Md8800 Quadro [16be:0007,16be:0008,16be:000d]
98 97 -> LifeView FlyDVB-S /Acorp TV134DS [5168:0300,4e42:0300] 98 97 -> LifeView FlyDVB-S /Acorp TV134DS [5168:0300,4e42:0300]
99 98 -> Proteus Pro 2309 [0919:2003] 99 98 -> Proteus Pro 2309 [0919:2003]
100 99 -> AVerMedia TV Hybrid A16AR [1461:2c00] 100 99 -> AVerMedia TV Hybrid A16AR [1461:2c00]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 0e8e8081f51c..c03784ee7f11 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4564,6 +4564,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4564 },{ 4564 },{
4565 .vendor = PCI_VENDOR_ID_PHILIPS, 4565 .vendor = PCI_VENDOR_ID_PHILIPS,
4566 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 4566 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
4567 .subvendor = 0x16be,
4568 .subdevice = 0x000d, /* triple CTX948_V1.1.1 */
4569 .driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO,
4570 }, {
4571 .vendor = PCI_VENDOR_ID_PHILIPS,
4572 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
4567 .subvendor = 0x1461, 4573 .subvendor = 0x1461,
4568 .subdevice = 0x2c05, 4574 .subdevice = 0x2c05,
4569 .driver_data = SAA7134_BOARD_AVERMEDIA_777, 4575 .driver_data = SAA7134_BOARD_AVERMEDIA_777,