Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ad1ef131c35bb6967acd5ce3072a32ec1d27b482
Commit:     ad1ef131c35bb6967acd5ce3072a32ec1d27b482
Parent:     4ba243734a0363649c514353334ed3d6ca39a5fb
Author:     Hermann Pitton <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 20 19:32:39 2008 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Mon Feb 18 11:14:56 2008 -0300

    V4L/DVB (7083): saa7134: enable radio and external analog audio-in on the 
md2819
    
    It also enumerates now the separate composite input at first
    and adds mute ability to radio and external audio-in.
    
    Many thanks to Daftcho Tabakov for reporting the flaws and testing.
    
    Signed-off-by: Hermann Pitton <[EMAIL PROTECTED]>
    Signed-off-by: Hartmut Hackmann <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/saa7134/saa7134-cards.c |   31 ++++++++++++++++++--------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/drivers/media/video/saa7134/saa7134-cards.c 
b/drivers/media/video/saa7134/saa7134-cards.c
index 176543f..0e8e808 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -928,27 +928,38 @@ struct saa7134_board saa7134_boards[] = {
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
+               .gpiomask       = 0x03,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
                        .amux = TV,
                        .tv   = 1,
-               },{
+                       .gpio = 0x00,
+               }, {
                        .name = name_comp1,
-                       .vmux = 0,
-                       .amux = LINE2,
-               },{
-                       .name = name_comp2,
                        .vmux = 3,
-                       .amux = LINE2,
-               },{
+                       .amux = LINE1,
+                       .gpio = 0x02,
+               }, {
+                       .name = name_comp2,
+                       .vmux = 0,
+                       .amux = LINE1,
+                       .gpio = 0x02,
+               }, {
                        .name = name_svideo,
                        .vmux = 8,
-                       .amux = LINE2,
-               }},
+                       .amux = LINE1,
+                       .gpio = 0x02,
+               } },
                .radio = {
                        .name = name_radio,
-                       .amux = LINE2,
+                       .amux = LINE1,
+                       .gpio = 0x01,
+               },
+               .mute  = {
+                       .name = name_mute,
+                       .amux = TV,
+                       .gpio = 0x00,
                },
        },
        [SAA7134_BOARD_BMK_MPEX_TUNER] = {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to