diff options
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 14 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
3 files changed, 24 insertions, 3 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index dc57225f3..33b6cf9bc 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -37,7 +37,7 @@ 36 -> UPMOST PURPLE TV [12ab:0800] 37 -> Items MuchTV Plus / IT-005 38 -> Terratec Cinergy 200 TV [153B:1152] - 39 -> LifeView FlyTV Platinum Mini [5168:0212] + 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212] 40 -> Compro VideoMate TV PVR/FM [185b:c100] 41 -> Compro VideoMate TV Gold+ [185b:c100] 42 -> Sabrent SBT-TVFM (saa7130) diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index dd5c905fe..e4a4f7bc9 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.87 2005/09/01 21:23:34 mkrufky Exp $ + * $Id: saa7134-cards.c,v 1.88 2005/09/05 14:52:03 nsh Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -193,10 +193,14 @@ struct saa7134_board saa7134_boards[] = { .amux = TV, .tv = 1, },{ - .name = name_comp1, + .name = name_comp1, /* Composite signal on S-Video input */ .vmux = 0, .amux = LINE2, },{ + .name = name_comp2, /* Composite input */ + .vmux = 3, + .amux = LINE2, + },{ .name = name_svideo, .vmux = 8, .amux = LINE2, @@ -2195,6 +2199,12 @@ struct pci_device_id saa7134_pci_tbl[] = { },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x4e42, + .subdevice = 0x0212, /* OEM minipci, LR212 */ + .driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x5168, /* Animation Technologies (LifeView) */ .subdevice = 0x0214, /* Standard PCI, LR214WF */ .driver_data = SAA7134_BOARD_FLYTVPLATINUM_FM, diff --git a/v4l/ChangeLog b/v4l/ChangeLog index c5996417e..5e47c1a47 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-09-05 14:56 nshmyrev + + * saa7134-cards.c: + - Added support for OEM version of FlyTV Platinum mini with a + subvendor id of 0x4e42. + - Added the OEM PCI id's to the docs/CARDLIST.saa7134 for item 39 + - Modified the vmux in the SAA7134_BOARD_FLYTVPLATINUM_MINI driver + data from 0 (Composite over S-Video) to 3 (Composite). + + Signed-off-by: Glen Gray <glen@lincor.com> + 2005-09-04 13:32 mkrufky * cx88-input.c: (cx88_ir_init): |