diff options
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 28 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
4 files changed, 41 insertions, 4 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index d2688c71c..51252ff03 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -62,7 +62,7 @@ 61 -> Philips TOUGH DVB-T reference design [1131:2004] 62 -> Compro VideoMate TV Gold+II 63 -> Kworld Xpert TV PVR7134 - 64 -> FlyTV mini Asus Digimatrix [1043:0210,1043:0210] + 64 -> FlyTV mini Asus Digimatrix [1043:0210] 65 -> V-Stream Studio TV Terminator 66 -> Yuan TUN-900 (saa7135) 67 -> Beholder BeholdTV 409 FM [0000:4091] @@ -78,3 +78,4 @@ 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] 78 -> ASUSTeK P7131 Dual [1043:4862] 79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B) + 80 -> ASUS Digimatrix TV [1043:0210] diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 060515642..a8074cc05 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.106 2005/10/20 19:00:57 mkrufky Exp $ + * $Id: saa7134-cards.c,v 1.107 2005/10/23 17:46:42 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2466,6 +2466,30 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE2, }}, }, + [SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV] = { + /* "Cyril Lacoux (Yack)" <clacoux@ifeelgood.org> */ + .name = "ASUS Digimatrix TV", + .audio_clock = 0x00200000, + .tuner_type = TUNER_PHILIPS_FQ1216ME, + .tda9887_conf = TDA9887_PRESENT, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .inputs = {{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .tv = 1, + },{ + .name = name_comp1, + .vmux = 3, + .amux = LINE1, + },{ + .name = name_svideo, + .vmux = 8, + .amux = LINE1, + }}, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -2827,7 +2851,7 @@ struct pci_device_id saa7134_pci_tbl[] = { .device = PCI_DEVICE_ID_PHILIPS_SAA7134, .subvendor = 0x1043, .subdevice = 0x0210, /* mini pci PAL/SECAM version */ - .driver_data = SAA7134_BOARD_FLYTV_DIGIMATRIX, + .driver_data = SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS, diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 2a8c3964d..5c0866970 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.72 2005/10/20 19:00:57 mkrufky Exp $ + * $Id: saa7134.h,v 1.73 2005/10/23 17:46:42 mkrufky Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -214,6 +214,7 @@ struct saa7134_format { #define SAA7134_BOARD_PINNACLE_PCTV_110i 77 #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 #define SAA7134_BOARD_PCTV_CARDBUS 79 +#define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index de4d3c769..ce2312a69 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-10-23 18:43 mkrufky + + * ../linux/Documentation/video4linux/CARDLIST.saa7134: + * ../linux/drivers/media/video/saa7134/saa7134-cards.c: + * ../linux/drivers/media/video/saa7134/saa7134.h: + - Fix bug 5484: ASUS digimatrix card doesnt work with PAL tuner + - Created new card entry (80), to separate NTSC (7135) card + from PAL (7134) card versions. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-23 14:56 mkrufky * ../v4l/Make.config: |