summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-01-07 22:19:48 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-01-07 22:19:48 -0200
commitdc174a49c7635e041e2805c7ad2c3ba04b1c4630 (patch)
tree40c241e80f3b17f435bf9d9e07e8f45e2c9a5ace /linux/drivers/media/video
parentbe76532b9adf8f303ba6f5f30a731225b5c1970d (diff)
downloadmediapointer-dvb-s2-dc174a49c7635e041e2805c7ad2c3ba04b1c4630.tar.gz
mediapointer-dvb-s2-dc174a49c7635e041e2805c7ad2c3ba04b1c4630.tar.bz2
MSI TV@nywhere Plus fixes
From: hermann pitton <hermann-pitton@arcor.de> - 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 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index cf6ced646..99fab333f 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -2576,6 +2576,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,
@@ -2584,15 +2585,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] = {