aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/hda/patch_realtek.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a2cebd7c135d..dc77d75c3552 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8068,7 +8068,7 @@ static struct snd_kcontrol_new alc883_fivestack_mixer[] = {
8068 { } /* end */ 8068 { } /* end */
8069}; 8069};
8070 8070
8071static struct snd_kcontrol_new alc883_tagra_mixer[] = { 8071static struct snd_kcontrol_new alc883_targa_mixer[] = {
8072 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), 8072 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
8073 HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), 8073 HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
8074 HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), 8074 HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -8088,7 +8088,7 @@ static struct snd_kcontrol_new alc883_tagra_mixer[] = {
8088 { } /* end */ 8088 { } /* end */
8089}; 8089};
8090 8090
8091static struct snd_kcontrol_new alc883_tagra_2ch_mixer[] = { 8091static struct snd_kcontrol_new alc883_targa_2ch_mixer[] = {
8092 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), 8092 HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
8093 HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT), 8093 HDA_CODEC_MUTE("Headphone Playback Switch", 0x14, 0x0, HDA_OUTPUT),
8094 HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), 8094 HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
@@ -8417,7 +8417,7 @@ static struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = {
8417 { } /* end */ 8417 { } /* end */
8418}; 8418};
8419 8419
8420static struct hda_verb alc883_tagra_verbs[] = { 8420static struct hda_verb alc883_targa_verbs[] = {
8421 {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, 8421 {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
8422 {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, 8422 {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
8423 8423
@@ -8626,8 +8626,8 @@ static void alc883_medion_md2_init_hook(struct hda_codec *codec)
8626} 8626}
8627 8627
8628/* toggle speaker-output according to the hp-jack state */ 8628/* toggle speaker-output according to the hp-jack state */
8629#define alc883_tagra_init_hook alc882_targa_init_hook 8629#define alc883_targa_init_hook alc882_targa_init_hook
8630#define alc883_tagra_unsol_event alc882_targa_unsol_event 8630#define alc883_targa_unsol_event alc882_targa_unsol_event
8631 8631
8632static void alc883_clevo_m720_mic_automute(struct hda_codec *codec) 8632static void alc883_clevo_m720_mic_automute(struct hda_codec *codec)
8633{ 8633{
@@ -9166,8 +9166,8 @@ static struct alc_config_preset alc883_presets[] = {
9166 .input_mux = &alc883_capture_source, 9166 .input_mux = &alc883_capture_source,
9167 }, 9167 },
9168 [ALC883_TARGA_DIG] = { 9168 [ALC883_TARGA_DIG] = {
9169 .mixers = { alc883_tagra_mixer, alc883_chmode_mixer }, 9169 .mixers = { alc883_targa_mixer, alc883_chmode_mixer },
9170 .init_verbs = { alc883_init_verbs, alc883_tagra_verbs}, 9170 .init_verbs = { alc883_init_verbs, alc883_targa_verbs},
9171 .num_dacs = ARRAY_SIZE(alc883_dac_nids), 9171 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
9172 .dac_nids = alc883_dac_nids, 9172 .dac_nids = alc883_dac_nids,
9173 .dig_out_nid = ALC883_DIGOUT_NID, 9173 .dig_out_nid = ALC883_DIGOUT_NID,
@@ -9175,12 +9175,12 @@ static struct alc_config_preset alc883_presets[] = {
9175 .channel_mode = alc883_3ST_6ch_modes, 9175 .channel_mode = alc883_3ST_6ch_modes,
9176 .need_dac_fix = 1, 9176 .need_dac_fix = 1,
9177 .input_mux = &alc883_capture_source, 9177 .input_mux = &alc883_capture_source,
9178 .unsol_event = alc883_tagra_unsol_event, 9178 .unsol_event = alc883_targa_unsol_event,
9179 .init_hook = alc883_tagra_init_hook, 9179 .init_hook = alc883_targa_init_hook,
9180 }, 9180 },
9181 [ALC883_TARGA_2ch_DIG] = { 9181 [ALC883_TARGA_2ch_DIG] = {
9182 .mixers = { alc883_tagra_2ch_mixer}, 9182 .mixers = { alc883_targa_2ch_mixer},
9183 .init_verbs = { alc883_init_verbs, alc883_tagra_verbs}, 9183 .init_verbs = { alc883_init_verbs, alc883_targa_verbs},
9184 .num_dacs = ARRAY_SIZE(alc883_dac_nids), 9184 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
9185 .dac_nids = alc883_dac_nids, 9185 .dac_nids = alc883_dac_nids,
9186 .adc_nids = alc883_adc_nids_alt, 9186 .adc_nids = alc883_adc_nids_alt,
@@ -9189,13 +9189,13 @@ static struct alc_config_preset alc883_presets[] = {
9189 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), 9189 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
9190 .channel_mode = alc883_3ST_2ch_modes, 9190 .channel_mode = alc883_3ST_2ch_modes,
9191 .input_mux = &alc883_capture_source, 9191 .input_mux = &alc883_capture_source,
9192 .unsol_event = alc883_tagra_unsol_event, 9192 .unsol_event = alc883_targa_unsol_event,
9193 .init_hook = alc883_tagra_init_hook, 9193 .init_hook = alc883_targa_init_hook,
9194 }, 9194 },
9195 [ALC883_TARGA_8ch_DIG] = { 9195 [ALC883_TARGA_8ch_DIG] = {
9196 .mixers = { alc883_base_mixer, alc883_chmode_mixer }, 9196 .mixers = { alc883_base_mixer, alc883_chmode_mixer },
9197 .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, 9197 .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs,
9198 alc883_tagra_verbs }, 9198 alc883_targa_verbs },
9199 .num_dacs = ARRAY_SIZE(alc883_dac_nids), 9199 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
9200 .dac_nids = alc883_dac_nids, 9200 .dac_nids = alc883_dac_nids,
9201 .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev), 9201 .num_adc_nids = ARRAY_SIZE(alc883_adc_nids_rev),
@@ -9207,8 +9207,8 @@ static struct alc_config_preset alc883_presets[] = {
9207 .channel_mode = alc883_4ST_8ch_modes, 9207 .channel_mode = alc883_4ST_8ch_modes,
9208 .need_dac_fix = 1, 9208 .need_dac_fix = 1,
9209 .input_mux = &alc883_capture_source, 9209 .input_mux = &alc883_capture_source,
9210 .unsol_event = alc883_tagra_unsol_event, 9210 .unsol_event = alc883_targa_unsol_event,
9211 .init_hook = alc883_tagra_init_hook, 9211 .init_hook = alc883_targa_init_hook,
9212 }, 9212 },
9213 [ALC883_ACER] = { 9213 [ALC883_ACER] = {
9214 .mixers = { alc883_base_mixer }, 9214 .mixers = { alc883_base_mixer },
@@ -9362,7 +9362,7 @@ static struct alc_config_preset alc883_presets[] = {
9362 .init_hook = alc888_lenovo_ms7195_front_automute, 9362 .init_hook = alc888_lenovo_ms7195_front_automute,
9363 }, 9363 },
9364 [ALC883_HAIER_W66] = { 9364 [ALC883_HAIER_W66] = {
9365 .mixers = { alc883_tagra_2ch_mixer}, 9365 .mixers = { alc883_targa_2ch_mixer},
9366 .init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs}, 9366 .init_verbs = { alc883_init_verbs, alc883_haier_w66_verbs},
9367 .num_dacs = ARRAY_SIZE(alc883_dac_nids), 9367 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
9368 .dac_nids = alc883_dac_nids, 9368 .dac_nids = alc883_dac_nids,