diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index fbbdfbc8a1c..9b58f29833e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -13789,19 +13789,19 @@ static void alc269_laptop_unsol_event(struct hda_codec *codec, | |||
13789 | } | 13789 | } |
13790 | } | 13790 | } |
13791 | 13791 | ||
13792 | static void alc269_laptop_dmic_setup(struct hda_codec *codec) | 13792 | static void alc269_laptop_amic_setup(struct hda_codec *codec) |
13793 | { | 13793 | { |
13794 | struct alc_spec *spec = codec->spec; | 13794 | struct alc_spec *spec = codec->spec; |
13795 | spec->autocfg.hp_pins[0] = 0x15; | 13795 | spec->autocfg.hp_pins[0] = 0x15; |
13796 | spec->autocfg.speaker_pins[0] = 0x14; | 13796 | spec->autocfg.speaker_pins[0] = 0x14; |
13797 | spec->ext_mic.pin = 0x18; | 13797 | spec->ext_mic.pin = 0x18; |
13798 | spec->ext_mic.mux_idx = 0; | 13798 | spec->ext_mic.mux_idx = 0; |
13799 | spec->int_mic.pin = 0x12; | 13799 | spec->int_mic.pin = 0x19; |
13800 | spec->int_mic.mux_idx = 5; | 13800 | spec->int_mic.mux_idx = 1; |
13801 | spec->auto_mic = 1; | 13801 | spec->auto_mic = 1; |
13802 | } | 13802 | } |
13803 | 13803 | ||
13804 | static void alc269vb_laptop_dmic_setup(struct hda_codec *codec) | 13804 | static void alc269_laptop_dmic_setup(struct hda_codec *codec) |
13805 | { | 13805 | { |
13806 | struct alc_spec *spec = codec->spec; | 13806 | struct alc_spec *spec = codec->spec; |
13807 | spec->autocfg.hp_pins[0] = 0x15; | 13807 | spec->autocfg.hp_pins[0] = 0x15; |
@@ -13809,14 +13809,14 @@ static void alc269vb_laptop_dmic_setup(struct hda_codec *codec) | |||
13809 | spec->ext_mic.pin = 0x18; | 13809 | spec->ext_mic.pin = 0x18; |
13810 | spec->ext_mic.mux_idx = 0; | 13810 | spec->ext_mic.mux_idx = 0; |
13811 | spec->int_mic.pin = 0x12; | 13811 | spec->int_mic.pin = 0x12; |
13812 | spec->int_mic.mux_idx = 6; | 13812 | spec->int_mic.mux_idx = 5; |
13813 | spec->auto_mic = 1; | 13813 | spec->auto_mic = 1; |
13814 | } | 13814 | } |
13815 | 13815 | ||
13816 | static void alc269_laptop_amic_setup(struct hda_codec *codec) | 13816 | static void alc269vb_laptop_amic_setup(struct hda_codec *codec) |
13817 | { | 13817 | { |
13818 | struct alc_spec *spec = codec->spec; | 13818 | struct alc_spec *spec = codec->spec; |
13819 | spec->autocfg.hp_pins[0] = 0x15; | 13819 | spec->autocfg.hp_pins[0] = 0x21; |
13820 | spec->autocfg.speaker_pins[0] = 0x14; | 13820 | spec->autocfg.speaker_pins[0] = 0x14; |
13821 | spec->ext_mic.pin = 0x18; | 13821 | spec->ext_mic.pin = 0x18; |
13822 | spec->ext_mic.mux_idx = 0; | 13822 | spec->ext_mic.mux_idx = 0; |
@@ -13825,6 +13825,18 @@ static void alc269_laptop_amic_setup(struct hda_codec *codec) | |||
13825 | spec->auto_mic = 1; | 13825 | spec->auto_mic = 1; |
13826 | } | 13826 | } |
13827 | 13827 | ||
13828 | static void alc269vb_laptop_dmic_setup(struct hda_codec *codec) | ||
13829 | { | ||
13830 | struct alc_spec *spec = codec->spec; | ||
13831 | spec->autocfg.hp_pins[0] = 0x21; | ||
13832 | spec->autocfg.speaker_pins[0] = 0x14; | ||
13833 | spec->ext_mic.pin = 0x18; | ||
13834 | spec->ext_mic.mux_idx = 0; | ||
13835 | spec->int_mic.pin = 0x12; | ||
13836 | spec->int_mic.mux_idx = 6; | ||
13837 | spec->auto_mic = 1; | ||
13838 | } | ||
13839 | |||
13828 | static void alc269_laptop_inithook(struct hda_codec *codec) | 13840 | static void alc269_laptop_inithook(struct hda_codec *codec) |
13829 | { | 13841 | { |
13830 | alc269_speaker_automute(codec); | 13842 | alc269_speaker_automute(codec); |
@@ -14162,7 +14174,7 @@ static struct alc_config_preset alc269_presets[] = { | |||
14162 | .num_channel_mode = ARRAY_SIZE(alc269_modes), | 14174 | .num_channel_mode = ARRAY_SIZE(alc269_modes), |
14163 | .channel_mode = alc269_modes, | 14175 | .channel_mode = alc269_modes, |
14164 | .unsol_event = alc269_laptop_unsol_event, | 14176 | .unsol_event = alc269_laptop_unsol_event, |
14165 | .setup = alc269_laptop_amic_setup, | 14177 | .setup = alc269vb_laptop_amic_setup, |
14166 | .init_hook = alc269_laptop_inithook, | 14178 | .init_hook = alc269_laptop_inithook, |
14167 | }, | 14179 | }, |
14168 | [ALC269VB_DMIC] = { | 14180 | [ALC269VB_DMIC] = { |