aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorhermann pitton <hermann-pitton@arcor.de>2007-01-07 21:19:48 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-01-15 16:25:58 -0200
commite382f62be8a92ebbdf697ebfab260b7d943a359f (patch)
tree8dea360ad22ecbb904cb2b9ceb77ec26e3417a5f /drivers/media
parent55d5440d4587454628a850ce26703639885af678 (diff)
downloadkernel_samsung_smdk4412-e382f62be8a92ebbdf697ebfab260b7d943a359f.zip
kernel_samsung_smdk4412-e382f62be8a92ebbdf697ebfab260b7d943a359f.tar.gz
kernel_samsung_smdk4412-e382f62be8a92ebbdf697ebfab260b7d943a359f.tar.bz2
V4L/DVB (5033): MSI TV@nywhere Plus fixes
- MSI TV@nywhere Plus. Fix radio, S-Video and external analog audio in as far we can know currently. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 4dead84..ae984bb 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2570,6 +2570,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
+ .gpiomask = 1 << 21,
.inputs = {{
.name = name_tv,
.vmux = 1,
@@ -2578,15 +2579,20 @@ struct saa7134_board saa7134_boards[] = {
},{
.name = name_comp1,
.vmux = 3,
- .amux = LINE1,
+ .amux = LINE2, /* unconfirmed, taken from Philips driver */
+ },{
+ .name = name_comp2,
+ .vmux = 0, /* untested, Composite over S-Video */
+ .amux = LINE2,
},{
.name = name_svideo,
- .vmux = 0,
- .amux = LINE1,
+ .vmux = 8,
+ .amux = LINE2,
}},
.radio = {
.name = name_radio,
- .amux = LINE1,
+ .amux = TV,
+ .gpio = 0x0200000,
},
},
[SAA7134_BOARD_CINERGY250PCI] = {