lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] v4l: 847: fix bug 5484 asus digimatrix card doesnt work with pal tuner

Browse Source 
- Fix bug 5484: ASUS digimatrix card doesnt work with PAL tuner

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
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>
This commit is contained in:
Michael Krufky
2005-11-08 21:38:08 -08:00
committed by Linus Torvalds
parent 791b403f5f
commit 5d5c9904e5
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/video4linux/CARDLIST.saa7134
View File

@@ -62,7 +62,7 @@
61 -> Philips TOUGH DVB-T reference design [1131:2004] 61 -> Philips TOUGH DVB-T reference design [1131:2004]
62 -> Compro VideoMate TV Gold+II 62 -> Compro VideoMate TV Gold+II
63 -> Kworld Xpert TV PVR7134 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 65 -> V-Stream Studio TV Terminator
66 -> Yuan TUN-900 (saa7135) 66 -> Yuan TUN-900 (saa7135)
67 -> Beholder BeholdTV 409 FM [0000:4091] 67 -> Beholder BeholdTV 409 FM [0000:4091]
@@ -78,3 +78,4 @@
77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e]
78 -> ASUSTeK P7131 Dual [1043:4862] 78 -> ASUSTeK P7131 Dual [1043:4862]
79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B) 79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B)
80 -> ASUS Digimatrix TV [1043:0210]

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

@@ -2461,6 +2461,30 @@ struct saa7134_board saa7134_boards[] = {
.amux = LINE2, .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); const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -2822,7 +2846,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
.device = PCI_DEVICE_ID_PHILIPS_SAA7134, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = 0x1043, .subvendor = 0x1043,
.subdevice = 0x0210, /* mini pci PAL/SECAM version */ .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, .vendor = PCI_VENDOR_ID_PHILIPS,

1
drivers/media/video/saa7134/saa7134.h
View File

@@ -207,6 +207,7 @@ struct saa7134_format {
#define SAA7134_BOARD_PINNACLE_PCTV_110i 77 #define SAA7134_BOARD_PINNACLE_PCTV_110i 77
#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
#define SAA7134_BOARD_PCTV_CARDBUS 79 #define SAA7134_BOARD_PCTV_CARDBUS 79
#define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80
#define SAA7134_MAXBOARDS 8 #define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8 #define SAA7134_INPUT_MAX 8