diff options
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index dc77d75c3552..8cebe2653223 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -970,7 +970,7 @@ static void alc_automute_pin(struct hda_codec *codec) | |||
970 | } | 970 | } |
971 | } | 971 | } |
972 | 972 | ||
973 | #if 0 /* it's broken in some acses -- temporarily disabled */ | 973 | #if 0 /* it's broken in some cases -- temporarily disabled */ |
974 | static void alc_mic_automute(struct hda_codec *codec) | 974 | static void alc_mic_automute(struct hda_codec *codec) |
975 | { | 975 | { |
976 | struct alc_spec *spec = codec->spec; | 976 | struct alc_spec *spec = codec->spec; |
@@ -1170,7 +1170,7 @@ static int alc_subsystem_id(struct hda_codec *codec, | |||
1170 | 1170 | ||
1171 | /* invalid SSID, check the special NID pin defcfg instead */ | 1171 | /* invalid SSID, check the special NID pin defcfg instead */ |
1172 | /* | 1172 | /* |
1173 | * 31~30 : port conetcivity | 1173 | * 31~30 : port connectivity |
1174 | * 29~21 : reserve | 1174 | * 29~21 : reserve |
1175 | * 20 : PCBEEP input | 1175 | * 20 : PCBEEP input |
1176 | * 19~16 : Check sum (15:1) | 1176 | * 19~16 : Check sum (15:1) |
@@ -6347,7 +6347,7 @@ static struct hda_channel_mode alc882_sixstack_modes[2] = { | |||
6347 | }; | 6347 | }; |
6348 | 6348 | ||
6349 | /* | 6349 | /* |
6350 | * macbook pro ALC885 can switch LineIn to LineOut without loosing Mic | 6350 | * macbook pro ALC885 can switch LineIn to LineOut without losing Mic |
6351 | */ | 6351 | */ |
6352 | 6352 | ||
6353 | /* | 6353 | /* |
@@ -7047,7 +7047,7 @@ static struct hda_verb alc882_auto_init_verbs[] = { | |||
7047 | #define alc882_loopbacks alc880_loopbacks | 7047 | #define alc882_loopbacks alc880_loopbacks |
7048 | #endif | 7048 | #endif |
7049 | 7049 | ||
7050 | /* pcm configuration: identiacal with ALC880 */ | 7050 | /* pcm configuration: identical with ALC880 */ |
7051 | #define alc882_pcm_analog_playback alc880_pcm_analog_playback | 7051 | #define alc882_pcm_analog_playback alc880_pcm_analog_playback |
7052 | #define alc882_pcm_analog_capture alc880_pcm_analog_capture | 7052 | #define alc882_pcm_analog_capture alc880_pcm_analog_capture |
7053 | #define alc882_pcm_digital_playback alc880_pcm_digital_playback | 7053 | #define alc882_pcm_digital_playback alc880_pcm_digital_playback |
@@ -8957,7 +8957,7 @@ static void alc889A_mb31_unsol_event(struct hda_codec *codec, unsigned int res) | |||
8957 | #define alc883_loopbacks alc880_loopbacks | 8957 | #define alc883_loopbacks alc880_loopbacks |
8958 | #endif | 8958 | #endif |
8959 | 8959 | ||
8960 | /* pcm configuration: identiacal with ALC880 */ | 8960 | /* pcm configuration: identical with ALC880 */ |
8961 | #define alc883_pcm_analog_playback alc880_pcm_analog_playback | 8961 | #define alc883_pcm_analog_playback alc880_pcm_analog_playback |
8962 | #define alc883_pcm_analog_capture alc880_pcm_analog_capture | 8962 | #define alc883_pcm_analog_capture alc880_pcm_analog_capture |
8963 | #define alc883_pcm_analog_alt_capture alc880_pcm_analog_alt_capture | 8963 | #define alc883_pcm_analog_alt_capture alc880_pcm_analog_alt_capture |
@@ -11132,7 +11132,7 @@ static struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = { | |||
11132 | #define alc262_loopbacks alc880_loopbacks | 11132 | #define alc262_loopbacks alc880_loopbacks |
11133 | #endif | 11133 | #endif |
11134 | 11134 | ||
11135 | /* pcm configuration: identiacal with ALC880 */ | 11135 | /* pcm configuration: identical with ALC880 */ |
11136 | #define alc262_pcm_analog_playback alc880_pcm_analog_playback | 11136 | #define alc262_pcm_analog_playback alc880_pcm_analog_playback |
11137 | #define alc262_pcm_analog_capture alc880_pcm_analog_capture | 11137 | #define alc262_pcm_analog_capture alc880_pcm_analog_capture |
11138 | #define alc262_pcm_digital_playback alc880_pcm_digital_playback | 11138 | #define alc262_pcm_digital_playback alc880_pcm_digital_playback |
@@ -12287,7 +12287,7 @@ static void alc268_auto_init_mono_speaker_out(struct hda_codec *codec) | |||
12287 | AC_VERB_SET_AMP_GAIN_MUTE, dac_vol2); | 12287 | AC_VERB_SET_AMP_GAIN_MUTE, dac_vol2); |
12288 | } | 12288 | } |
12289 | 12289 | ||
12290 | /* pcm configuration: identiacal with ALC880 */ | 12290 | /* pcm configuration: identical with ALC880 */ |
12291 | #define alc268_pcm_analog_playback alc880_pcm_analog_playback | 12291 | #define alc268_pcm_analog_playback alc880_pcm_analog_playback |
12292 | #define alc268_pcm_analog_capture alc880_pcm_analog_capture | 12292 | #define alc268_pcm_analog_capture alc880_pcm_analog_capture |
12293 | #define alc268_pcm_analog_alt_capture alc880_pcm_analog_alt_capture | 12293 | #define alc268_pcm_analog_alt_capture alc880_pcm_analog_alt_capture |
@@ -13198,7 +13198,7 @@ static int alc269_auto_create_analog_input_ctls(struct alc_spec *spec, | |||
13198 | #define alc269_loopbacks alc880_loopbacks | 13198 | #define alc269_loopbacks alc880_loopbacks |
13199 | #endif | 13199 | #endif |
13200 | 13200 | ||
13201 | /* pcm configuration: identiacal with ALC880 */ | 13201 | /* pcm configuration: identical with ALC880 */ |
13202 | #define alc269_pcm_analog_playback alc880_pcm_analog_playback | 13202 | #define alc269_pcm_analog_playback alc880_pcm_analog_playback |
13203 | #define alc269_pcm_analog_capture alc880_pcm_analog_capture | 13203 | #define alc269_pcm_analog_capture alc880_pcm_analog_capture |
13204 | #define alc269_pcm_digital_playback alc880_pcm_digital_playback | 13204 | #define alc269_pcm_digital_playback alc880_pcm_digital_playback |
@@ -14060,7 +14060,7 @@ static void alc861_toshiba_unsol_event(struct hda_codec *codec, | |||
14060 | alc861_toshiba_automute(codec); | 14060 | alc861_toshiba_automute(codec); |
14061 | } | 14061 | } |
14062 | 14062 | ||
14063 | /* pcm configuration: identiacal with ALC880 */ | 14063 | /* pcm configuration: identical with ALC880 */ |
14064 | #define alc861_pcm_analog_playback alc880_pcm_analog_playback | 14064 | #define alc861_pcm_analog_playback alc880_pcm_analog_playback |
14065 | #define alc861_pcm_analog_capture alc880_pcm_analog_capture | 14065 | #define alc861_pcm_analog_capture alc880_pcm_analog_capture |
14066 | #define alc861_pcm_digital_playback alc880_pcm_digital_playback | 14066 | #define alc861_pcm_digital_playback alc880_pcm_digital_playback |
@@ -14583,7 +14583,7 @@ static hda_nid_t alc861vd_dac_nids[4] = { | |||
14583 | 14583 | ||
14584 | /* dac_nids for ALC660vd are in a different order - according to | 14584 | /* dac_nids for ALC660vd are in a different order - according to |
14585 | * Realtek's driver. | 14585 | * Realtek's driver. |
14586 | * This should probably tesult in a different mixer for 6stack models | 14586 | * This should probably result in a different mixer for 6stack models |
14587 | * of ALC660vd codecs, but for now there is only 3stack mixer | 14587 | * of ALC660vd codecs, but for now there is only 3stack mixer |
14588 | * - and it is the same as in 861vd. | 14588 | * - and it is the same as in 861vd. |
14589 | * adc_nids in ALC660vd are (is) the same as in 861vd | 14589 | * adc_nids in ALC660vd are (is) the same as in 861vd |
@@ -15028,7 +15028,7 @@ static void alc861vd_dallas_init_hook(struct hda_codec *codec) | |||
15028 | #define alc861vd_loopbacks alc880_loopbacks | 15028 | #define alc861vd_loopbacks alc880_loopbacks |
15029 | #endif | 15029 | #endif |
15030 | 15030 | ||
15031 | /* pcm configuration: identiacal with ALC880 */ | 15031 | /* pcm configuration: identical with ALC880 */ |
15032 | #define alc861vd_pcm_analog_playback alc880_pcm_analog_playback | 15032 | #define alc861vd_pcm_analog_playback alc880_pcm_analog_playback |
15033 | #define alc861vd_pcm_analog_capture alc880_pcm_analog_capture | 15033 | #define alc861vd_pcm_analog_capture alc880_pcm_analog_capture |
15034 | #define alc861vd_pcm_digital_playback alc880_pcm_digital_playback | 15034 | #define alc861vd_pcm_digital_playback alc880_pcm_digital_playback |
@@ -15207,7 +15207,7 @@ static void alc861vd_auto_init_hp_out(struct hda_codec *codec) | |||
15207 | hda_nid_t pin; | 15207 | hda_nid_t pin; |
15208 | 15208 | ||
15209 | pin = spec->autocfg.hp_pins[0]; | 15209 | pin = spec->autocfg.hp_pins[0]; |
15210 | if (pin) /* connect to front and use dac 0 */ | 15210 | if (pin) /* connect to front and use dac 0 */ |
15211 | alc861vd_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); | 15211 | alc861vd_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); |
15212 | pin = spec->autocfg.speaker_pins[0]; | 15212 | pin = spec->autocfg.speaker_pins[0]; |
15213 | if (pin) | 15213 | if (pin) |
@@ -16670,7 +16670,7 @@ static struct snd_kcontrol_new alc272_nc10_mixer[] = { | |||
16670 | #endif | 16670 | #endif |
16671 | 16671 | ||
16672 | 16672 | ||
16673 | /* pcm configuration: identiacal with ALC880 */ | 16673 | /* pcm configuration: identical with ALC880 */ |
16674 | #define alc662_pcm_analog_playback alc880_pcm_analog_playback | 16674 | #define alc662_pcm_analog_playback alc880_pcm_analog_playback |
16675 | #define alc662_pcm_analog_capture alc880_pcm_analog_capture | 16675 | #define alc662_pcm_analog_capture alc880_pcm_analog_capture |
16676 | #define alc662_pcm_digital_playback alc880_pcm_digital_playback | 16676 | #define alc662_pcm_digital_playback alc880_pcm_digital_playback |