mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
ALSA: hda - Add ALC269VB support
- Add new models ALC269VB_AMIC ALC269VB_DMIC
- Add alc269vb_laptop_dmic_setup
The record source index Dmic is 0x6 for ALC269VB.
- Change eeepc words for ALC269
- Modify init_verb tables of patch_alc269 patch_alc662 patch_alc882
- Modify common patch for ALC270 ALC269VB ALC275
Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Kailang Yang
Takashi Iwai
parent
88102f3f84
commit
84898e87cc
1 changed files with 247 additions and 101 deletions
|
|
@ -131,8 +131,10 @@ enum {
|
|||
enum {
|
||||
ALC269_BASIC,
|
||||
ALC269_QUANTA_FL1,
|
||||
ALC269_ASUS_AMIC,
|
||||
ALC269_ASUS_DMIC,
|
||||
ALC269_AMIC,
|
||||
ALC269_DMIC,
|
||||
ALC269VB_AMIC,
|
||||
ALC269VB_DMIC,
|
||||
ALC269_FUJITSU,
|
||||
ALC269_LIFEBOOK,
|
||||
ALC269_AUTO,
|
||||
|
|
@ -13182,6 +13184,15 @@ static hda_nid_t alc269_capsrc_nids[1] = {
|
|||
0x23,
|
||||
};
|
||||
|
||||
static hda_nid_t alc269vb_adc_nids[1] = {
|
||||
/* ADC1 */
|
||||
0x09,
|
||||
};
|
||||
|
||||
static hda_nid_t alc269vb_capsrc_nids[1] = {
|
||||
0x22,
|
||||
};
|
||||
|
||||
/* NOTE: ADC2 (0x07) is connected from a recording *MIXER* (0x24),
|
||||
* not a mux!
|
||||
*/
|
||||
|
|
@ -13250,7 +13261,7 @@ static struct snd_kcontrol_new alc269_lifebook_mixer[] = {
|
|||
{ }
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
|
||||
static struct snd_kcontrol_new alc269_laptop_mixer[] = {
|
||||
HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),
|
||||
|
|
@ -13258,16 +13269,47 @@ static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
|
|||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new alc269vb_laptop_mixer[] = {
|
||||
HDA_CODEC_MUTE("Speaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x02, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_MUTE("Headphone Playback Switch", 0x21, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* capture mixer elements */
|
||||
static struct snd_kcontrol_new alc269_epc_capture_mixer[] = {
|
||||
static struct snd_kcontrol_new alc269_laptop_analog_capture_mixer[] = {
|
||||
HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new alc269_laptop_digital_capture_mixer[] = {
|
||||
HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new alc269vb_laptop_analog_capture_mixer[] = {
|
||||
HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("IntMic Boost", 0x19, 0, HDA_INPUT),
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new alc269vb_laptop_digital_capture_mixer[] = {
|
||||
HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* FSC amilo */
|
||||
#define alc269_fujitsu_mixer alc269_eeepc_mixer
|
||||
#define alc269_fujitsu_mixer alc269_laptop_mixer
|
||||
|
||||
static struct hda_verb alc269_quanta_fl1_verbs[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
|
|
@ -13410,7 +13452,7 @@ static void alc269_lifebook_init_hook(struct hda_codec *codec)
|
|||
alc269_lifebook_mic_autoswitch(codec);
|
||||
}
|
||||
|
||||
static struct hda_verb alc269_eeepc_dmic_init_verbs[] = {
|
||||
static struct hda_verb alc269_laptop_dmic_init_verbs[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x23, AC_VERB_SET_CONNECT_SEL, 0x05},
|
||||
{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
|
||||
|
|
@ -13421,7 +13463,7 @@ static struct hda_verb alc269_eeepc_dmic_init_verbs[] = {
|
|||
{}
|
||||
};
|
||||
|
||||
static struct hda_verb alc269_eeepc_amic_init_verbs[] = {
|
||||
static struct hda_verb alc269_laptop_amic_init_verbs[] = {
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x23, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
|
||||
|
|
@ -13431,6 +13473,28 @@ static struct hda_verb alc269_eeepc_amic_init_verbs[] = {
|
|||
{}
|
||||
};
|
||||
|
||||
static struct hda_verb alc269vb_laptop_dmic_init_verbs[] = {
|
||||
{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x22, AC_VERB_SET_CONNECT_SEL, 0x06},
|
||||
{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
|
||||
{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 << 8))},
|
||||
{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
|
||||
{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
|
||||
{}
|
||||
};
|
||||
|
||||
static struct hda_verb alc269vb_laptop_amic_init_verbs[] = {
|
||||
{0x21, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x22, AC_VERB_SET_CONNECT_SEL, 0x01},
|
||||
{0x02, AC_VERB_SET_AMP_GAIN_MUTE, 0xb026 },
|
||||
{0x09, AC_VERB_SET_AMP_GAIN_MUTE, (0x7019 | (0x00 << 8))},
|
||||
{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
|
||||
{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
|
||||
{}
|
||||
};
|
||||
|
||||
/* toggle speaker-output according to the hp-jack state */
|
||||
static void alc269_speaker_automute(struct hda_codec *codec)
|
||||
{
|
||||
|
|
@ -13448,7 +13512,7 @@ static void alc269_speaker_automute(struct hda_codec *codec)
|
|||
}
|
||||
|
||||
/* unsolicited event for HP jack sensing */
|
||||
static void alc269_eeepc_unsol_event(struct hda_codec *codec,
|
||||
static void alc269_laptop_unsol_event(struct hda_codec *codec,
|
||||
unsigned int res)
|
||||
{
|
||||
switch (res >> 26) {
|
||||
|
|
@ -13461,7 +13525,7 @@ static void alc269_eeepc_unsol_event(struct hda_codec *codec,
|
|||
}
|
||||
}
|
||||
|
||||
static void alc269_eeepc_dmic_setup(struct hda_codec *codec)
|
||||
static void alc269_laptop_dmic_setup(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
spec->ext_mic.pin = 0x18;
|
||||
|
|
@ -13471,7 +13535,17 @@ static void alc269_eeepc_dmic_setup(struct hda_codec *codec)
|
|||
spec->auto_mic = 1;
|
||||
}
|
||||
|
||||
static void alc269_eeepc_amic_setup(struct hda_codec *codec)
|
||||
static void alc269vb_laptop_dmic_setup(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
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_amic_setup(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
spec->ext_mic.pin = 0x18;
|
||||
|
|
@ -13481,7 +13555,7 @@ static void alc269_eeepc_amic_setup(struct hda_codec *codec)
|
|||
spec->auto_mic = 1;
|
||||
}
|
||||
|
||||
static void alc269_eeepc_inithook(struct hda_codec *codec)
|
||||
static void alc269_laptop_inithook(struct hda_codec *codec)
|
||||
{
|
||||
alc269_speaker_automute(codec);
|
||||
alc_mic_automute(codec);
|
||||
|
|
@ -13494,22 +13568,10 @@ static struct hda_verb alc269_init_verbs[] = {
|
|||
/*
|
||||
* Unmute ADC0 and set the default input to mic-in
|
||||
*/
|
||||
{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
|
||||
/* Mute input amps (PCBeep, Line In, Mic 1 & Mic 2) of the
|
||||
* analog-loopback mixer widget
|
||||
* Note: PASD motherboards uses the Line In 2 as the input for
|
||||
* front panel mic (mic 2)
|
||||
*/
|
||||
/* Amp Indices: Mic1 = 0, Mic2 = 1, Line1 = 2, Line2 = 3, CD = 4 */
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
|
||||
{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
|
||||
{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
|
||||
/*
|
||||
* Set up output mixers (0x0c - 0x0e)
|
||||
* Set up output mixers (0x02 - 0x03)
|
||||
*/
|
||||
/* set vol=0 to output mixers */
|
||||
{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
||||
|
|
@ -13534,26 +13596,57 @@ static struct hda_verb alc269_init_verbs[] = {
|
|||
|
||||
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
|
||||
{0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
{0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
|
||||
/* FIXME: use matrix-type input source selection */
|
||||
/* FIXME: use Mux-type input source selection */
|
||||
/* Mixer elements: 0x18, 19, 1a, 1b, 1d, 0b */
|
||||
/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
|
||||
{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
|
||||
{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},
|
||||
{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
|
||||
{0x23, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
|
||||
/* set EAPD */
|
||||
{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
|
||||
{ }
|
||||
};
|
||||
|
||||
static struct hda_verb alc269vb_init_verbs[] = {
|
||||
/*
|
||||
* Unmute ADC0 and set the default input to mic-in
|
||||
*/
|
||||
{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
|
||||
/*
|
||||
* Set up output mixers (0x02 - 0x03)
|
||||
*/
|
||||
/* set vol=0 to output mixers */
|
||||
{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
||||
{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
|
||||
|
||||
/* set up input amps for analog loopback */
|
||||
/* Amp Indices: DAC = 0, mixer = 1 */
|
||||
{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
|
||||
{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
|
||||
|
||||
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
|
||||
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
|
||||
/* FIXME: use Mux-type input source selection */
|
||||
/* Mixer elements: 0x18, 19, 1a, 1b, 1d, 0b */
|
||||
/* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */
|
||||
{0x22, AC_VERB_SET_CONNECT_SEL, 0x00},
|
||||
|
||||
/* set EAPD */
|
||||
{0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
|
||||
{0x15, AC_VERB_SET_EAPD_BTLENABLE, 2},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
@ -13601,6 +13694,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
|
|||
struct alc_spec *spec = codec->spec;
|
||||
int err;
|
||||
static hda_nid_t alc269_ignore[] = { 0x1d, 0 };
|
||||
hda_nid_t real_capsrc_nids;
|
||||
|
||||
err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
|
||||
alc269_ignore);
|
||||
|
|
@ -13622,11 +13716,20 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
|
|||
if (spec->kctls.list)
|
||||
add_mixer(spec, spec->kctls.list);
|
||||
|
||||
add_verb(spec, alc269_init_verbs);
|
||||
if ((alc_read_coef_idx(codec, 0) & 0x00f0) == 0x0010) {
|
||||
add_verb(spec, alc269vb_init_verbs);
|
||||
real_capsrc_nids = alc269vb_capsrc_nids[0];
|
||||
alc_ssid_check(codec, 0x21, 0x1b, 0x14);
|
||||
} else {
|
||||
add_verb(spec, alc269_init_verbs);
|
||||
real_capsrc_nids = alc269_capsrc_nids[0];
|
||||
alc_ssid_check(codec, 0x15, 0x1b, 0x14);
|
||||
}
|
||||
|
||||
spec->num_mux_defs = 1;
|
||||
spec->input_mux = &spec->private_imux[0];
|
||||
/* set default input source */
|
||||
snd_hda_codec_write_cache(codec, alc269_capsrc_nids[0],
|
||||
snd_hda_codec_write_cache(codec, real_capsrc_nids,
|
||||
0, AC_VERB_SET_CONNECT_SEL,
|
||||
spec->input_mux->items[0].index);
|
||||
|
||||
|
|
@ -13637,8 +13740,6 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
|
|||
if (!spec->cap_mixer && !spec->no_analog)
|
||||
set_capture_mixer(codec);
|
||||
|
||||
alc_ssid_check(codec, 0x15, 0x1b, 0x14);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -13664,8 +13765,8 @@ static void alc269_auto_init(struct hda_codec *codec)
|
|||
static const char *alc269_models[ALC269_MODEL_LAST] = {
|
||||
[ALC269_BASIC] = "basic",
|
||||
[ALC269_QUANTA_FL1] = "quanta",
|
||||
[ALC269_ASUS_AMIC] = "asus-amic",
|
||||
[ALC269_ASUS_DMIC] = "asus-dmic",
|
||||
[ALC269_AMIC] = "laptop-amic",
|
||||
[ALC269_DMIC] = "laptop-dmic",
|
||||
[ALC269_FUJITSU] = "fujitsu",
|
||||
[ALC269_LIFEBOOK] = "lifebook",
|
||||
[ALC269_AUTO] = "auto",
|
||||
|
|
@ -13674,41 +13775,49 @@ static const char *alc269_models[ALC269_MODEL_LAST] = {
|
|||
static struct snd_pci_quirk alc269_cfg_tbl[] = {
|
||||
SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1),
|
||||
SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
|
||||
ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80JT", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82Jv", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1383, "ASUS UJ30Jc", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x13d3, "ASUS N61JA", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1413, "ASUS UL50", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1443, "ASUS UL30", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1453, "ASUS M60Jv", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1483, "ASUS UL80", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x14f3, "ASUS F83Vf", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS UL20", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1513, "ASUS UX30", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15a3, "ASUS N60Jv", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15b3, "ASUS N60Dp", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15c3, "ASUS N70De", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15e3, "ASUS F83T", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1643, "ASUS M60J", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1693, "ASUS F50N", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_ASUS_DMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_ASUS_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_ASUS_AMIC),
|
||||
ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269VB_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1113, "ASUS N63Jn", ALC269VB_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1143, "ASUS B53f", ALC269VB_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1183, "ASUS K72DR", ALC269VB_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x11b3, "ASUS K52DR", ALC269VB_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x11e3, "ASUS U33Jc", ALC269VB_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80Jt", ALC269VB_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82Jv", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x12d3, "ASUS N61Jv", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1383, "ASUS UJ30Jc", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x13d3, "ASUS N61JA", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1413, "ASUS UL50", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1443, "ASUS UL30", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1453, "ASUS M60Jv", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1483, "ASUS UL80", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x14f3, "ASUS F83Vf", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS UL20", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1513, "ASUS UX30", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1593, "ASUS N51Vn", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15a3, "ASUS N60Jv", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15b3, "ASUS N60Dp", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15c3, "ASUS N70De", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x15e3, "ASUS F83T", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1643, "ASUS M60J", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1693, "ASUS F50N", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_DMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_AMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901",
|
||||
ALC269_ASUS_DMIC),
|
||||
ALC269_DMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101",
|
||||
ALC269_ASUS_DMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005HA", ALC269_ASUS_DMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005HA", ALC269_ASUS_DMIC),
|
||||
ALC269_DMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005HA", ALC269_DMIC),
|
||||
SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005HA", ALC269_DMIC),
|
||||
SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU),
|
||||
SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK),
|
||||
{}
|
||||
|
|
@ -13738,47 +13847,75 @@ static struct alc_config_preset alc269_presets[] = {
|
|||
.setup = alc269_quanta_fl1_setup,
|
||||
.init_hook = alc269_quanta_fl1_init_hook,
|
||||
},
|
||||
[ALC269_ASUS_AMIC] = {
|
||||
.mixers = { alc269_eeepc_mixer },
|
||||
.cap_mixer = alc269_epc_capture_mixer,
|
||||
[ALC269_AMIC] = {
|
||||
.mixers = { alc269_laptop_mixer },
|
||||
.cap_mixer = alc269_laptop_analog_capture_mixer,
|
||||
.init_verbs = { alc269_init_verbs,
|
||||
alc269_eeepc_amic_init_verbs },
|
||||
alc269_laptop_amic_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc269_dac_nids),
|
||||
.dac_nids = alc269_dac_nids,
|
||||
.hp_nid = 0x03,
|
||||
.num_channel_mode = ARRAY_SIZE(alc269_modes),
|
||||
.channel_mode = alc269_modes,
|
||||
.unsol_event = alc269_eeepc_unsol_event,
|
||||
.setup = alc269_eeepc_amic_setup,
|
||||
.init_hook = alc269_eeepc_inithook,
|
||||
.unsol_event = alc269_laptop_unsol_event,
|
||||
.setup = alc269_laptop_amic_setup,
|
||||
.init_hook = alc269_laptop_inithook,
|
||||
},
|
||||
[ALC269_ASUS_DMIC] = {
|
||||
.mixers = { alc269_eeepc_mixer },
|
||||
.cap_mixer = alc269_epc_capture_mixer,
|
||||
[ALC269_DMIC] = {
|
||||
.mixers = { alc269_laptop_mixer },
|
||||
.cap_mixer = alc269_laptop_digital_capture_mixer,
|
||||
.init_verbs = { alc269_init_verbs,
|
||||
alc269_eeepc_dmic_init_verbs },
|
||||
alc269_laptop_dmic_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc269_dac_nids),
|
||||
.dac_nids = alc269_dac_nids,
|
||||
.hp_nid = 0x03,
|
||||
.num_channel_mode = ARRAY_SIZE(alc269_modes),
|
||||
.channel_mode = alc269_modes,
|
||||
.unsol_event = alc269_eeepc_unsol_event,
|
||||
.setup = alc269_eeepc_dmic_setup,
|
||||
.init_hook = alc269_eeepc_inithook,
|
||||
.unsol_event = alc269_laptop_unsol_event,
|
||||
.setup = alc269_laptop_dmic_setup,
|
||||
.init_hook = alc269_laptop_inithook,
|
||||
},
|
||||
[ALC269VB_AMIC] = {
|
||||
.mixers = { alc269vb_laptop_mixer },
|
||||
.cap_mixer = alc269vb_laptop_analog_capture_mixer,
|
||||
.init_verbs = { alc269vb_init_verbs,
|
||||
alc269vb_laptop_amic_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc269_dac_nids),
|
||||
.dac_nids = alc269_dac_nids,
|
||||
.hp_nid = 0x03,
|
||||
.num_channel_mode = ARRAY_SIZE(alc269_modes),
|
||||
.channel_mode = alc269_modes,
|
||||
.unsol_event = alc269_laptop_unsol_event,
|
||||
.setup = alc269_laptop_amic_setup,
|
||||
.init_hook = alc269_laptop_inithook,
|
||||
},
|
||||
[ALC269VB_DMIC] = {
|
||||
.mixers = { alc269vb_laptop_mixer },
|
||||
.cap_mixer = alc269vb_laptop_digital_capture_mixer,
|
||||
.init_verbs = { alc269vb_init_verbs,
|
||||
alc269vb_laptop_dmic_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc269_dac_nids),
|
||||
.dac_nids = alc269_dac_nids,
|
||||
.hp_nid = 0x03,
|
||||
.num_channel_mode = ARRAY_SIZE(alc269_modes),
|
||||
.channel_mode = alc269_modes,
|
||||
.unsol_event = alc269_laptop_unsol_event,
|
||||
.setup = alc269vb_laptop_dmic_setup,
|
||||
.init_hook = alc269_laptop_inithook,
|
||||
},
|
||||
[ALC269_FUJITSU] = {
|
||||
.mixers = { alc269_fujitsu_mixer },
|
||||
.cap_mixer = alc269_epc_capture_mixer,
|
||||
.cap_mixer = alc269_laptop_digital_capture_mixer,
|
||||
.init_verbs = { alc269_init_verbs,
|
||||
alc269_eeepc_dmic_init_verbs },
|
||||
alc269_laptop_dmic_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc269_dac_nids),
|
||||
.dac_nids = alc269_dac_nids,
|
||||
.hp_nid = 0x03,
|
||||
.num_channel_mode = ARRAY_SIZE(alc269_modes),
|
||||
.channel_mode = alc269_modes,
|
||||
.unsol_event = alc269_eeepc_unsol_event,
|
||||
.setup = alc269_eeepc_dmic_setup,
|
||||
.init_hook = alc269_eeepc_inithook,
|
||||
.unsol_event = alc269_laptop_unsol_event,
|
||||
.setup = alc269_laptop_dmic_setup,
|
||||
.init_hook = alc269_laptop_inithook,
|
||||
},
|
||||
[ALC269_LIFEBOOK] = {
|
||||
.mixers = { alc269_lifebook_mixer },
|
||||
|
|
@ -13799,6 +13936,7 @@ static int patch_alc269(struct hda_codec *codec)
|
|||
struct alc_spec *spec;
|
||||
int board_config;
|
||||
int err;
|
||||
int is_alc269vb = 0;
|
||||
|
||||
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
|
||||
if (spec == NULL)
|
||||
|
|
@ -13815,6 +13953,7 @@ static int patch_alc269(struct hda_codec *codec)
|
|||
alc_free(codec);
|
||||
return -ENOMEM;
|
||||
}
|
||||
is_alc269vb = 1;
|
||||
}
|
||||
|
||||
board_config = snd_hda_check_board_config(codec, ALC269_MODEL_LAST,
|
||||
|
|
@ -13850,7 +13989,7 @@ static int patch_alc269(struct hda_codec *codec)
|
|||
if (board_config != ALC269_AUTO)
|
||||
setup_preset(codec, &alc269_presets[board_config]);
|
||||
|
||||
if (codec->subsystem_id == 0x17aa3bf8) {
|
||||
if (board_config == ALC269_QUANTA_FL1) {
|
||||
/* Due to a hardware problem on Lenovo Ideadpad, we need to
|
||||
* fix the sample rate of analog I/O to 44.1kHz
|
||||
*/
|
||||
|
|
@ -13863,9 +14002,16 @@ static int patch_alc269(struct hda_codec *codec)
|
|||
spec->stream_digital_playback = &alc269_pcm_digital_playback;
|
||||
spec->stream_digital_capture = &alc269_pcm_digital_capture;
|
||||
|
||||
spec->adc_nids = alc269_adc_nids;
|
||||
spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
|
||||
spec->capsrc_nids = alc269_capsrc_nids;
|
||||
if (!is_alc269vb) {
|
||||
spec->adc_nids = alc269_adc_nids;
|
||||
spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
|
||||
spec->capsrc_nids = alc269_capsrc_nids;
|
||||
} else {
|
||||
spec->adc_nids = alc269vb_adc_nids;
|
||||
spec->num_adc_nids = ARRAY_SIZE(alc269vb_adc_nids);
|
||||
spec->capsrc_nids = alc269vb_capsrc_nids;
|
||||
}
|
||||
|
||||
if (!spec->cap_mixer)
|
||||
set_capture_mixer(codec);
|
||||
set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
|
||||
|
|
|
|||
Loading…
Reference in a new issue