diff options
-rw-r--r-- | 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 176543f723ca..0e8e8081f51c 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[] = { | |||
928 | .tuner_addr = ADDR_UNSET, | 928 | .tuner_addr = ADDR_UNSET, |
929 | .radio_addr = ADDR_UNSET, | 929 | .radio_addr = ADDR_UNSET, |
930 | .tda9887_conf = TDA9887_PRESENT, | 930 | .tda9887_conf = TDA9887_PRESENT, |
931 | .gpiomask = 0x03, | ||
931 | .inputs = {{ | 932 | .inputs = {{ |
932 | .name = name_tv, | 933 | .name = name_tv, |
933 | .vmux = 1, | 934 | .vmux = 1, |
934 | .amux = TV, | 935 | .amux = TV, |
935 | .tv = 1, | 936 | .tv = 1, |
936 | },{ | 937 | .gpio = 0x00, |
938 | }, { | ||
937 | .name = name_comp1, | 939 | .name = name_comp1, |
938 | .vmux = 0, | ||
939 | .amux = LINE2, | ||
940 | },{ | ||
941 | .name = name_comp2, | ||
942 | .vmux = 3, | 940 | .vmux = 3, |
943 | .amux = LINE2, | 941 | .amux = LINE1, |
944 | },{ | 942 | .gpio = 0x02, |
943 | }, { | ||
944 | .name = name_comp2, | ||
945 | .vmux = 0, | ||
946 | .amux = LINE1, | ||
947 | .gpio = 0x02, | ||
948 | }, { | ||
945 | .name = name_svideo, | 949 | .name = name_svideo, |
946 | .vmux = 8, | 950 | .vmux = 8, |
947 | .amux = LINE2, | 951 | .amux = LINE1, |
948 | }}, | 952 | .gpio = 0x02, |
953 | } }, | ||
949 | .radio = { | 954 | .radio = { |
950 | .name = name_radio, | 955 | .name = name_radio, |
951 | .amux = LINE2, | 956 | .amux = LINE1, |
957 | .gpio = 0x01, | ||
958 | }, | ||
959 | .mute = { | ||
960 | .name = name_mute, | ||
961 | .amux = TV, | ||
962 | .gpio = 0x00, | ||
952 | }, | 963 | }, |
953 | }, | 964 | }, |
954 | [SAA7134_BOARD_BMK_MPEX_TUNER] = { | 965 | [SAA7134_BOARD_BMK_MPEX_TUNER] = { |