aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-cards.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-cards.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c
index ba2b0cf4531..dc3fbb32068 100644
--- a/drivers/media/video/ivtv/ivtv-cards.c
+++ b/drivers/media/video/ivtv/ivtv-cards.c
@@ -923,7 +923,6 @@ static const struct ivtv_card ivtv_card_club3d = {
923 { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL }, 923 { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL },
924 }, 924 },
925 .radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO5 }, 925 .radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO5 },
926 .gpio_init = { .direction = 0x1000, .initial_value = 0x1000 }, /* tuner reset */
927 .xceive_pin = 12, 926 .xceive_pin = 12,
928 .tuners = { 927 .tuners = {
929 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, 928 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
@@ -959,7 +958,7 @@ static const struct ivtv_card ivtv_card_avertv_mce116 = {
959 { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL, 1 }, 958 { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL, 1 },
960 }, 959 },
961 /* enable line-in */ 960 /* enable line-in */
962 .gpio_init = { .direction = 0xe400, .initial_value = 0x4400 }, 961 .gpio_init = { .direction = 0xe000, .initial_value = 0x4000 },
963 .xceive_pin = 10, 962 .xceive_pin = 10,
964 .tuners = { 963 .tuners = {
965 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, 964 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
@@ -1102,7 +1101,7 @@ static const struct ivtv_card ivtv_card_aver_m104 = {
1102 }, 1101 },
1103 .radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, 2 }, 1102 .radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, 2 },
1104 /* enable line-in + reset tuner */ 1103 /* enable line-in + reset tuner */
1105 .gpio_init = { .direction = 0xe400, .initial_value = 0x4000 }, 1104 .gpio_init = { .direction = 0xe000, .initial_value = 0x4000 },
1106 .xceive_pin = 10, 1105 .xceive_pin = 10,
1107 .tuners = { 1106 .tuners = {
1108 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, 1107 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
@@ -1138,7 +1137,6 @@ static const struct ivtv_card ivtv_card_buffalo = {
1138 { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO5 }, 1137 { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO5 },
1139 { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL }, 1138 { IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL },
1140 }, 1139 },
1141 .gpio_init = { .direction = 0x1000, .initial_value = 0x1000 },
1142 .xceive_pin = 12, 1140 .xceive_pin = 12,
1143 .tuners = { 1141 .tuners = {
1144 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, 1142 { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },