summaryrefslogtreecommitdiff
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
authorPavel Mihaylov <bin@bash.info>2005-11-08 21:38:43 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:30 -0800
commitc3d931929f1d11f9d198567850247ae1754dfc06 (patch)
tree2b212bbda7cfb82d11d9aa57a799439e41d29eb5 /drivers/media/video/saa7134/saa7134-cards.c
parent90e9df7f186876584b938e01fcf7f40a50c950b9 (diff)
[PATCH] V4L: 906: remote and more info for pctv cardbus whitespace cleanup
Remote and more info for PCTV Cardbus. Whitespace cleanup. Signed-off-by: Pavel Mihaylov <bin@bash.info> 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>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index d9b3fb0f3eff..e3fe15a14aee 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2453,18 +2453,33 @@ struct saa7134_board saa7134_boards[] = {
},
[SAA7134_BOARD_PCTV_CARDBUS] = {
/* Paul Tom Zalac <pzalac@gmail.com> */
- /* tda8275a tuner doesnt work yet */
+ /* Pavel Mihaylov <bin@bash.info> */
.name = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)",
+ /* Sedna Cardbus TV Tuner */
.audio_clock = 0x00187de7,
- .tuner_type = TUNER_ABSENT,
+ .tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
+ .gpiomask = 0xe880c0,
.inputs = {{
+ .name = name_tv,
+ .vmux = 3,
+ .amux = TV,
+ .tv = 1,
+ },{
.name = name_comp1,
.vmux = 1,
- .amux = LINE2,
+ .amux = LINE1,
+ },{
+ .name = name_svideo,
+ .vmux = 6,
+ .amux = LINE1,
}},
+ .radio = {
+ .name = name_radio,
+ .amux = LINE2,
+ },
},
[SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV] = {
/* "Cyril Lacoux (Yack)" <clacoux@ifeelgood.org> */
@@ -2942,7 +2957,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
.subvendor = 0x1043,
.subdevice = 0x4862,
.driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL,
- },{
+ },{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = PCI_VENDOR_ID_PHILIPS,