redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] v4l: 627: added support for oem version of flytv platinum mini with a 

- 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>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
wifi-calibration
Glen Gray 2005-11-08 21:36:12 -08:00 committed by Linus Torvalds
parent cc952d03c0
commit 2d14f78e4b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/video4linux/CARDLIST.saa7134
View File

@ -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)

12
drivers/media/video/saa7134/saa7134-cards.c
View File

@ -191,9 +191,13 @@ 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,
@ -2190,6 +2194,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.subvendor = 0x5168,
.subdevice = 0x0212, /* minipci, LR212 */
.driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI,
},{
.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,