Skip to content

L
linux
Commit f53281e6 authored by Kailang Yang's avatar Kailang Yang Committed by Takashi Iwai
Browse files
Options

ALSA: hda - Add support of ASUS Eeepc P90* 

- Support ASUS_P900A = P703
- Support ASUS_P901
Signed-off-by: default avatarKailang Yang <kailang@realtek.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 51f6baad
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 7 deletions
sound/pci/hda/patch_realtek.c
View file @ f53281e6
...@@ -122,6 +122,8 @@ enum { ...@@ -122,6 +122,8 @@ enum {
/* ALC269 models */ /* ALC269 models */
enum { enum {
ALC269_BASIC, ALC269_BASIC,
ALC269_ASUS_EEEPC_P703,
ALC269_ASUS_EEEPC_P901,
ALC269_AUTO, ALC269_AUTO,
ALC269_MODEL_LAST /* last tag */ ALC269_MODEL_LAST /* last tag */
}; };
...@@ -10946,7 +10948,23 @@ static int patch_alc268(struct hda_codec *codec) ...@@ -10946,7 +10948,23 @@ static int patch_alc268(struct hda_codec *codec)
static hda_nid_t alc269_adc_nids[1] = { static hda_nid_t alc269_adc_nids[1] = {
/* ADC1 */ /* ADC1 */
0x07, 0x08,
};
static struct hda_input_mux alc269_eeepc_dmic_capture_source = {
.num_items = 2,
.items = {
{ "i-Mic", 0x5 },
{ "e-Mic", 0x0 },
},
};
static struct hda_input_mux alc269_eeepc_amic_capture_source = {
.num_items = 2,
.items = {
{ "i-Mic", 0x1 },
{ "e-Mic", 0x0 },
},
}; };
#define alc269_modes alc260_modes #define alc269_modes alc260_modes
...@@ -10968,10 +10986,27 @@ static struct snd_kcontrol_new alc269_base_mixer[] = { ...@@ -10968,10 +10986,27 @@ static struct snd_kcontrol_new alc269_base_mixer[] = {
{ } /* end */ { } /* end */
}; };
/* bind volumes of both NID 0x0c and 0x0d */
static struct hda_bind_ctls alc269_epc_bind_vol = {
.ops = &snd_hda_bind_vol,
.values = {
HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
HDA_COMPOSE_AMP_VAL(0x03, 3, 0, HDA_OUTPUT),
0
},
};
static struct snd_kcontrol_new alc269_eeepc_mixer[] = {
HDA_CODEC_MUTE("iSpeaker Playback Switch", 0x14, 0x0, HDA_OUTPUT),
HDA_BIND_VOL("LineOut Playback Volume", &alc269_epc_bind_vol),
HDA_CODEC_MUTE("LineOut Playback Switch", 0x15, 0x0, HDA_OUTPUT),
{ } /* end */
};
/* capture mixer elements */ /* capture mixer elements */
static struct snd_kcontrol_new alc269_capture_mixer[] = { static struct snd_kcontrol_new alc269_capture_mixer[] = {
HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT), HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT), HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
/* The multiple "Capture Source" controls confuse alsamixer /* The multiple "Capture Source" controls confuse alsamixer
...@@ -10987,6 +11022,13 @@ static struct snd_kcontrol_new alc269_capture_mixer[] = { ...@@ -10987,6 +11022,13 @@ static struct snd_kcontrol_new alc269_capture_mixer[] = {
{ } /* end */ { } /* end */
}; };
/* capture mixer elements */
static struct snd_kcontrol_new alc269_epc_capture_mixer[] = {
HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
{ } /* end */
};
/* /*
* generic initialization of ADC, input mixers and output mixers * generic initialization of ADC, input mixers and output mixers
*/ */
...@@ -10994,7 +11036,7 @@ static struct hda_verb alc269_init_verbs[] = { ...@@ -10994,7 +11036,7 @@ static struct hda_verb alc269_init_verbs[] = {
/* /*
* Unmute ADC0 and set the default input to mic-in * Unmute ADC0 and set the default input to mic-in
*/ */
{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
/* Mute input amps (PCBeep, Line In, Mic 1 & Mic 2) of the /* Mute input amps (PCBeep, Line In, Mic 1 & Mic 2) of the
* analog-loopback mixer widget * analog-loopback mixer widget
...@@ -11057,6 +11099,98 @@ static struct hda_verb alc269_init_verbs[] = { ...@@ -11057,6 +11099,98 @@ static struct hda_verb alc269_init_verbs[] = {
{ } { }
}; };
static struct hda_verb alc269_eeepc_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 },
{0x08, 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},
{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT},
{}
};
static struct hda_verb alc269_eeepc_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 },
{0x08, AC_VERB_SET_AMP_GAIN_MUTE, (0x701b | (0x00 << 8))},
{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT},
{0x15, 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)
{
unsigned int present;
unsigned int bits;
present = snd_hda_codec_read(codec, 0x15, 0,
AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
bits = present ? AMP_IN_MUTE(0) : 0;
snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
AMP_IN_MUTE(0), bits);
snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 1,
AMP_IN_MUTE(0), bits);
}
static void alc269_eeepc_dmic_automute(struct hda_codec *codec)
{
unsigned int present;
present = snd_hda_codec_read(codec, 0x18, 0, AC_VERB_GET_PIN_SENSE, 0)
& AC_PINSENSE_PRESENCE;
snd_hda_codec_write(codec, 0x23, 0, AC_VERB_SET_CONNECT_SEL,
present ? 0 : 5);
}
static void alc269_eeepc_amic_automute(struct hda_codec *codec)
{
unsigned int present;
present = snd_hda_codec_read(codec, 0x18, 0, AC_VERB_GET_PIN_SENSE, 0)
& AC_PINSENSE_PRESENCE;
snd_hda_codec_write(codec, 0x24, 0, AC_VERB_SET_AMP_GAIN_MUTE,
present ? AMP_IN_UNMUTE(0) : AMP_IN_MUTE(0));
snd_hda_codec_write(codec, 0x24, 0, AC_VERB_SET_AMP_GAIN_MUTE,
present ? AMP_IN_MUTE(1) : AMP_IN_UNMUTE(1));
}
/* unsolicited event for HP jack sensing */
static void alc269_eeepc_dmic_unsol_event(struct hda_codec *codec,
unsigned int res)
{
if ((res >> 26) == ALC880_HP_EVENT)
alc269_speaker_automute(codec);
if ((res >> 26) == ALC880_MIC_EVENT)
alc269_eeepc_dmic_automute(codec);
}
static void alc269_eeepc_dmic_inithook(struct hda_codec *codec)
{
alc269_speaker_automute(codec);
alc269_eeepc_dmic_automute(codec);
}
/* unsolicited event for HP jack sensing */
static void alc269_eeepc_amic_unsol_event(struct hda_codec *codec,
unsigned int res)
{
if ((res >> 26) == ALC880_HP_EVENT)
alc269_speaker_automute(codec);
if ((res >> 26) == ALC880_MIC_EVENT)
alc269_eeepc_amic_automute(codec);
}
static void alc269_eeepc_amic_inithook(struct hda_codec *codec)
{
alc269_speaker_automute(codec);
alc269_eeepc_amic_automute(codec);
}
/* add playback controls from the parsed DAC table */ /* add playback controls from the parsed DAC table */
static int alc269_auto_create_multi_out_ctls(struct alc_spec *spec, static int alc269_auto_create_multi_out_ctls(struct alc_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
...@@ -11188,6 +11322,9 @@ static int alc269_parse_auto_config(struct hda_codec *codec) ...@@ -11188,6 +11322,9 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
if (err < 0) if (err < 0)
return err; return err;
spec->mixers[spec->num_mixers] = alc269_capture_mixer;
spec->num_mixers++;
return 1; return 1;
} }
...@@ -11215,12 +11352,16 @@ static const char *alc269_models[ALC269_MODEL_LAST] = { ...@@ -11215,12 +11352,16 @@ static const char *alc269_models[ALC269_MODEL_LAST] = {
}; };
static struct snd_pci_quirk alc269_cfg_tbl[] = { static struct snd_pci_quirk alc269_cfg_tbl[] = {
SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
ALC269_ASUS_EEEPC_P703),
SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901",
ALC269_ASUS_EEEPC_P901),
{} {}
}; };
static struct alc_config_preset alc269_presets[] = { static struct alc_config_preset alc269_presets[] = {
[ALC269_BASIC] = { [ALC269_BASIC] = {
.mixers = { alc269_base_mixer }, .mixers = { alc269_base_mixer, alc269_capture_mixer },
.init_verbs = { alc269_init_verbs }, .init_verbs = { alc269_init_verbs },
.num_dacs = ARRAY_SIZE(alc269_dac_nids), .num_dacs = ARRAY_SIZE(alc269_dac_nids),
.dac_nids = alc269_dac_nids, .dac_nids = alc269_dac_nids,
...@@ -11229,6 +11370,32 @@ static struct alc_config_preset alc269_presets[] = { ...@@ -11229,6 +11370,32 @@ static struct alc_config_preset alc269_presets[] = {
.channel_mode = alc269_modes, .channel_mode = alc269_modes,
.input_mux = &alc269_capture_source, .input_mux = &alc269_capture_source,
}, },
[ALC269_ASUS_EEEPC_P703] = {
.mixers = { alc269_eeepc_mixer, alc269_epc_capture_mixer },
.init_verbs = { alc269_init_verbs,
alc269_eeepc_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,
.input_mux = &alc269_eeepc_amic_capture_source,
.unsol_event = alc269_eeepc_amic_unsol_event,
.init_hook = alc269_eeepc_amic_inithook,
},
[ALC269_ASUS_EEEPC_P901] = {
.mixers = { alc269_eeepc_mixer, alc269_epc_capture_mixer},
.init_verbs = { alc269_init_verbs,
alc269_eeepc_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,
.input_mux = &alc269_eeepc_dmic_capture_source,
.unsol_event = alc269_eeepc_dmic_unsol_event,
.init_hook = alc269_eeepc_dmic_inithook,
},
}; };
static int patch_alc269(struct hda_codec *codec) static int patch_alc269(struct hda_codec *codec)
...@@ -11282,8 +11449,6 @@ static int patch_alc269(struct hda_codec *codec) ...@@ -11282,8 +11449,6 @@ static int patch_alc269(struct hda_codec *codec)
spec->adc_nids = alc269_adc_nids; spec->adc_nids = alc269_adc_nids;
spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids); spec->num_adc_nids = ARRAY_SIZE(alc269_adc_nids);
spec->mixers[spec->num_mixers] = alc269_capture_mixer;
spec->num_mixers++;
codec->patch_ops = alc_patch_ops; codec->patch_ops = alc_patch_ops;
if (board_config == ALC269_AUTO) if (board_config == ALC269_AUTO)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7