V4L/DVB (6144): Fix mux setup for composite sound on AverTV 307
authorStas Sergeev <stsp@aknet.ru>
Sun, 2 Sep 2007 06:56:18 +0000 (03:56 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 14 Sep 2007 16:13:41 +0000 (13:13 -0300)
Right now the composite sound input doesn't work on AverTV 307 because of
the wrong mux setup.  The composite sound is routed via an external
4channel multiplexer controlled by GPIO, while the code assumes an internal
multiplexer instead.

Presumably this was a copy/paste error, and noone have ever tested the
functionality.

With the attached patch it works properly, which gives me an ability to
finally watch the cable TV under linux.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/saa7134/saa7134-cards.c

index 8ec83bd70094fd7714fb905c46c85b7848ad0ee4..25ec16810818c2758555ad11a3c98ffc4e466e92 100644 (file)
@@ -1537,18 +1537,18 @@ struct saa7134_board saa7134_boards[] = {
                },{
                        .name = name_comp1,
                        .vmux = 0,
-                       .amux = LINE2,
-                       .gpio = 0x00,
+                       .amux = LINE1,
+                       .gpio = 0x02,
                },{
                        .name = name_comp2,
                        .vmux = 3,
-                       .amux = LINE2,
-                       .gpio = 0x00,
+                       .amux = LINE1,
+                       .gpio = 0x02,
                },{
                        .name = name_svideo,
                        .vmux = 8,
-                       .amux = LINE2,
-                       .gpio = 0x00,
+                       .amux = LINE1,
+                       .gpio = 0x02,
                }},
                .radio = {
                        .name = name_radio,