Commit 226b1ec8 authored by Kailang Yang's avatar Kailang Yang Committed by Takashi Iwai

ALSA: hda - Fix setup for ALC269vb amic and dmic models

Corrected HP and mic pins for ALC269vb amic and dmic models.
Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 531d8791
...@@ -13789,19 +13789,19 @@ static void alc269_laptop_unsol_event(struct hda_codec *codec, ...@@ -13789,19 +13789,19 @@ static void alc269_laptop_unsol_event(struct hda_codec *codec,
} }
} }
static void alc269_laptop_dmic_setup(struct hda_codec *codec) static void alc269_laptop_amic_setup(struct hda_codec *codec)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.hp_pins[0] = 0x15;
spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x14;
spec->ext_mic.pin = 0x18; spec->ext_mic.pin = 0x18;
spec->ext_mic.mux_idx = 0; spec->ext_mic.mux_idx = 0;
spec->int_mic.pin = 0x12; spec->int_mic.pin = 0x19;
spec->int_mic.mux_idx = 5; spec->int_mic.mux_idx = 1;
spec->auto_mic = 1; spec->auto_mic = 1;
} }
static void alc269vb_laptop_dmic_setup(struct hda_codec *codec) static void alc269_laptop_dmic_setup(struct hda_codec *codec)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.hp_pins[0] = 0x15;
...@@ -13809,14 +13809,14 @@ static void alc269vb_laptop_dmic_setup(struct hda_codec *codec) ...@@ -13809,14 +13809,14 @@ static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
spec->ext_mic.pin = 0x18; spec->ext_mic.pin = 0x18;
spec->ext_mic.mux_idx = 0; spec->ext_mic.mux_idx = 0;
spec->int_mic.pin = 0x12; spec->int_mic.pin = 0x12;
spec->int_mic.mux_idx = 6; spec->int_mic.mux_idx = 5;
spec->auto_mic = 1; spec->auto_mic = 1;
} }
static void alc269_laptop_amic_setup(struct hda_codec *codec) static void alc269vb_laptop_amic_setup(struct hda_codec *codec)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.hp_pins[0] = 0x21;
spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x14;
spec->ext_mic.pin = 0x18; spec->ext_mic.pin = 0x18;
spec->ext_mic.mux_idx = 0; spec->ext_mic.mux_idx = 0;
...@@ -13825,6 +13825,18 @@ static void alc269_laptop_amic_setup(struct hda_codec *codec) ...@@ -13825,6 +13825,18 @@ static void alc269_laptop_amic_setup(struct hda_codec *codec)
spec->auto_mic = 1; spec->auto_mic = 1;
} }
static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
{
struct alc_spec *spec = codec->spec;
spec->autocfg.hp_pins[0] = 0x21;
spec->autocfg.speaker_pins[0] = 0x14;
spec->ext_mic.pin = 0x18;
spec->ext_mic.mux_idx = 0;
spec->int_mic.pin = 0x12;
spec->int_mic.mux_idx = 6;
spec->auto_mic = 1;
}
static void alc269_laptop_inithook(struct hda_codec *codec) static void alc269_laptop_inithook(struct hda_codec *codec)
{ {
alc269_speaker_automute(codec); alc269_speaker_automute(codec);
...@@ -14162,7 +14174,7 @@ static struct alc_config_preset alc269_presets[] = { ...@@ -14162,7 +14174,7 @@ static struct alc_config_preset alc269_presets[] = {
.num_channel_mode = ARRAY_SIZE(alc269_modes), .num_channel_mode = ARRAY_SIZE(alc269_modes),
.channel_mode = alc269_modes, .channel_mode = alc269_modes,
.unsol_event = alc269_laptop_unsol_event, .unsol_event = alc269_laptop_unsol_event,
.setup = alc269_laptop_amic_setup, .setup = alc269vb_laptop_amic_setup,
.init_hook = alc269_laptop_inithook, .init_hook = alc269_laptop_inithook,
}, },
[ALC269VB_DMIC] = { [ALC269VB_DMIC] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment