Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

authored by

Michael Krufky and committed by
Linus Torvalds
5d5c9904 791b403f

+28 -2
+2 -1
Documentation/video4linux/CARDLIST.saa7134
··· 62 62 61 -> Philips TOUGH DVB-T reference design [1131:2004] 63 63 62 -> Compro VideoMate TV Gold+II 64 64 63 -> Kworld Xpert TV PVR7134 65 - 64 -> FlyTV mini Asus Digimatrix [1043:0210,1043:0210] 65 + 64 -> FlyTV mini Asus Digimatrix [1043:0210] 66 66 65 -> V-Stream Studio TV Terminator 67 67 66 -> Yuan TUN-900 (saa7135) 68 68 67 -> Beholder BeholdTV 409 FM [0000:4091] ··· 78 78 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] 79 79 78 -> ASUSTeK P7131 Dual [1043:4862] 80 80 79 -> PCTV Cardbus TV/Radio (ITO25 Rev:2B) 81 + 80 -> ASUS Digimatrix TV [1043:0210]
+25 -1
drivers/media/video/saa7134/saa7134-cards.c
··· 2461 2461 .amux = LINE2, 2462 2462 }}, 2463 2463 }, 2464 + [SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV] = { 2465 + /* "Cyril Lacoux (Yack)" <clacoux@ifeelgood.org> */ 2466 + .name = "ASUS Digimatrix TV", 2467 + .audio_clock = 0x00200000, 2468 + .tuner_type = TUNER_PHILIPS_FQ1216ME, 2469 + .tda9887_conf = TDA9887_PRESENT, 2470 + .radio_type = UNSET, 2471 + .tuner_addr = ADDR_UNSET, 2472 + .radio_addr = ADDR_UNSET, 2473 + .inputs = {{ 2474 + .name = name_tv, 2475 + .vmux = 1, 2476 + .amux = TV, 2477 + .tv = 1, 2478 + },{ 2479 + .name = name_comp1, 2480 + .vmux = 3, 2481 + .amux = LINE1, 2482 + },{ 2483 + .name = name_svideo, 2484 + .vmux = 8, 2485 + .amux = LINE1, 2486 + }}, 2487 + }, 2464 2488 }; 2465 2489 2466 2490 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); ··· 2846 2822 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2847 2823 .subvendor = 0x1043, 2848 2824 .subdevice = 0x0210, /* mini pci PAL/SECAM version */ 2849 - .driver_data = SAA7134_BOARD_FLYTV_DIGIMATRIX, 2825 + .driver_data = SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV, 2850 2826 2851 2827 },{ 2852 2828 .vendor = PCI_VENDOR_ID_PHILIPS,
+1
drivers/media/video/saa7134/saa7134.h
··· 207 207 #define SAA7134_BOARD_PINNACLE_PCTV_110i 77 208 208 #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 209 209 #define SAA7134_BOARD_PCTV_CARDBUS 79 210 + #define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80 210 211 211 212 #define SAA7134_MAXBOARDS 8 212 213 #define SAA7134_INPUT_MAX 8