diff options
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0227b0c8a724..88a9da4afe5c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -7166,9 +7166,6 @@ static struct hda_verb alc882_targa_verbs[] = { | |||
7166 | {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */ | 7166 | {0x1b, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */ |
7167 | 7167 | ||
7168 | {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, | 7168 | {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, |
7169 | {0x01, AC_VERB_SET_GPIO_MASK, 0x03}, | ||
7170 | {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03}, | ||
7171 | {0x01, AC_VERB_SET_GPIO_DATA, 0x03}, | ||
7172 | { } /* end */ | 7169 | { } /* end */ |
7173 | }; | 7170 | }; |
7174 | 7171 | ||
@@ -8691,7 +8688,8 @@ static struct alc_config_preset alc882_presets[] = { | |||
8691 | }, | 8688 | }, |
8692 | [ALC883_TARGA_DIG] = { | 8689 | [ALC883_TARGA_DIG] = { |
8693 | .mixers = { alc883_targa_mixer, alc883_chmode_mixer }, | 8690 | .mixers = { alc883_targa_mixer, alc883_chmode_mixer }, |
8694 | .init_verbs = { alc883_init_verbs, alc883_targa_verbs}, | 8691 | .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, |
8692 | alc883_targa_verbs}, | ||
8695 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 8693 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
8696 | .dac_nids = alc883_dac_nids, | 8694 | .dac_nids = alc883_dac_nids, |
8697 | .dig_out_nid = ALC883_DIGOUT_NID, | 8695 | .dig_out_nid = ALC883_DIGOUT_NID, |
@@ -8704,7 +8702,8 @@ static struct alc_config_preset alc882_presets[] = { | |||
8704 | }, | 8702 | }, |
8705 | [ALC883_TARGA_2ch_DIG] = { | 8703 | [ALC883_TARGA_2ch_DIG] = { |
8706 | .mixers = { alc883_targa_2ch_mixer}, | 8704 | .mixers = { alc883_targa_2ch_mixer}, |
8707 | .init_verbs = { alc883_init_verbs, alc883_targa_verbs}, | 8705 | .init_verbs = { alc883_init_verbs, alc880_gpio3_init_verbs, |
8706 | alc883_targa_verbs}, | ||
8708 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | 8707 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), |
8709 | .dac_nids = alc883_dac_nids, | 8708 | .dac_nids = alc883_dac_nids, |
8710 | .adc_nids = alc883_adc_nids_alt, | 8709 | .adc_nids = alc883_adc_nids_alt, |
@@ -12431,9 +12430,9 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = { | |||
12431 | 12430 | ||
12432 | static struct snd_kcontrol_new alc269_eeepc_mixer[] = { | 12431 | static struct snd_kcontrol_new alc269_eeepc_mixer[] = { |
12433 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT), | 12432 | HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT), |
12434 | HDA_CODEC_MUTE("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT), | 12433 | HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT), |
12435 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), | 12434 | HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT), |
12436 | HDA_CODEC_MUTE("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT), | 12435 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT), |
12437 | { } /* end */ | 12436 | { } /* end */ |
12438 | }; | 12437 | }; |
12439 | 12438 | ||