ALSA: hda/realtek - Rewrite ALC880 model=uniwill with auto-parser
The model=uniwill would work almost as is, but a couple of adjustments are needed to make the mutli-io working correctly. The headphone and speaker pins have to be marked properly in pin configs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
parent
7833c7e8b4
commit
817de92f1b
@ -13,7 +13,6 @@ ALC880
|
||||
asus-w1v ASUS W1V
|
||||
asus-dig ASUS with SPDIF out
|
||||
asus-dig2 ASUS with SPDIF out (using GPIO2)
|
||||
uniwill 3-jack
|
||||
test for testing/debugging purpose, almost all controls can be
|
||||
adjusted. Appearing only when compiled with
|
||||
$CONFIG_SND_DEBUG=y
|
||||
|
||||
@ -18,7 +18,6 @@ enum {
|
||||
ALC880_ASUS_W1V,
|
||||
ALC880_ASUS_DIG2,
|
||||
ALC880_UNIWILL_DIG,
|
||||
ALC880_UNIWILL,
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
ALC880_TEST,
|
||||
#endif
|
||||
@ -306,34 +305,6 @@ static const struct snd_kcontrol_new alc880_asus_w1v_mixer[] = {
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/* Uniwill */
|
||||
static const struct snd_kcontrol_new alc880_uniwill_mixer[] = {
|
||||
HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
|
||||
HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
|
||||
HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
|
||||
HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
|
||||
HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
|
||||
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Channel Mode",
|
||||
.info = alc_ch_mode_info,
|
||||
.get = alc_ch_mode_get,
|
||||
.put = alc_ch_mode_put,
|
||||
},
|
||||
{ } /* end */
|
||||
};
|
||||
|
||||
/*
|
||||
* initialize the codec volumes, etc
|
||||
*/
|
||||
@ -518,83 +489,11 @@ static const struct hda_verb alc880_pin_6stack_init_verbs[] = {
|
||||
{ }
|
||||
};
|
||||
|
||||
/*
|
||||
* Uniwill pin configuration:
|
||||
* HP = 0x14, InternalSpeaker = 0x15, mic = 0x18, internal mic = 0x19,
|
||||
* line = 0x1a
|
||||
*/
|
||||
static const struct hda_verb alc880_uniwill_init_verbs[] = {
|
||||
{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */
|
||||
|
||||
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
|
||||
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
|
||||
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
|
||||
{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
|
||||
{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
|
||||
{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
|
||||
{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
|
||||
{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x00 << 8))},
|
||||
{0x0e, AC_VERB_SET_AMP_GAIN_MUTE, (0x7000 | (0x01 << 8))},
|
||||
|
||||
{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
|
||||
{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
|
||||
/* {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, */
|
||||
/* {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, */
|
||||
{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
|
||||
|
||||
{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
|
||||
{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_MIC_EVENT},
|
||||
|
||||
{ }
|
||||
};
|
||||
|
||||
static const struct hda_verb alc880_beep_init_verbs[] = {
|
||||
{ 0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5) },
|
||||
{ }
|
||||
};
|
||||
|
||||
static void alc880_uniwill_setup(struct hda_codec *codec)
|
||||
{
|
||||
struct alc_spec *spec = codec->spec;
|
||||
|
||||
spec->autocfg.hp_pins[0] = 0x14;
|
||||
spec->autocfg.speaker_pins[0] = 0x15;
|
||||
spec->autocfg.speaker_pins[0] = 0x16;
|
||||
alc_simple_setup_automute(spec, ALC_AUTOMUTE_AMP);
|
||||
}
|
||||
|
||||
static void alc880_uniwill_init_hook(struct hda_codec *codec)
|
||||
{
|
||||
alc_hp_automute(codec);
|
||||
alc88x_simple_mic_automute(codec);
|
||||
}
|
||||
|
||||
static void alc880_uniwill_unsol_event(struct hda_codec *codec,
|
||||
unsigned int res)
|
||||
{
|
||||
/* Looks like the unsol event is incompatible with the standard
|
||||
* definition. 4bit tag is placed at 28 bit!
|
||||
*/
|
||||
res >>= 28;
|
||||
switch (res) {
|
||||
case ALC_MIC_EVENT:
|
||||
alc88x_simple_mic_automute(codec);
|
||||
break;
|
||||
default:
|
||||
alc_exec_unsol_event(codec, res);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* ASUS pin configuration:
|
||||
* HP/front = 0x14, surr = 0x15, clfe = 0x16, mic = 0x18, line = 0x1a
|
||||
@ -911,7 +810,6 @@ static const char * const alc880_models[ALC880_MODEL_LAST] = {
|
||||
[ALC880_ASUS_W1V] = "asus-w1v",
|
||||
[ALC880_ASUS_DIG] = "asus-dig",
|
||||
[ALC880_ASUS_DIG2] = "asus-dig2",
|
||||
[ALC880_UNIWILL_DIG] = "uniwill",
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
[ALC880_TEST] = "test",
|
||||
#endif
|
||||
@ -955,7 +853,6 @@ static const struct snd_pci_quirk alc880_cfg_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),
|
||||
SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
|
||||
SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),
|
||||
SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),
|
||||
SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),
|
||||
SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
|
||||
SND_PCI_QUIRK(0x2668, 0x8086, NULL, ALC880_6ST_DIG), /* broken BIOS */
|
||||
@ -1123,21 +1020,6 @@ static const struct alc_config_preset alc880_presets[] = {
|
||||
.need_dac_fix = 1,
|
||||
.input_mux = &alc880_capture_source,
|
||||
},
|
||||
[ALC880_UNIWILL] = {
|
||||
.mixers = { alc880_uniwill_mixer },
|
||||
.init_verbs = { alc880_volume_init_verbs,
|
||||
alc880_uniwill_init_verbs },
|
||||
.num_dacs = ARRAY_SIZE(alc880_asus_dac_nids),
|
||||
.dac_nids = alc880_asus_dac_nids,
|
||||
.dig_out_nid = ALC880_DIGOUT_NID,
|
||||
.num_channel_mode = ARRAY_SIZE(alc880_threestack_modes),
|
||||
.channel_mode = alc880_threestack_modes,
|
||||
.need_dac_fix = 1,
|
||||
.input_mux = &alc880_capture_source,
|
||||
.unsol_event = alc880_uniwill_unsol_event,
|
||||
.setup = alc880_uniwill_setup,
|
||||
.init_hook = alc880_uniwill_init_hook,
|
||||
},
|
||||
#ifdef CONFIG_SND_DEBUG
|
||||
[ALC880_TEST] = {
|
||||
.mixers = { alc880_test_mixer },
|
||||
|
||||
@ -165,15 +165,3 @@ static void alc_simple_setup_automute(struct alc_spec *spec, int mode)
|
||||
spec->automute_lo = spec->automute_lo_possible = !!lo_pin;
|
||||
spec->automute_speaker = spec->automute_speaker_possible = !!spec->autocfg.speaker_pins[0];
|
||||
}
|
||||
|
||||
/* auto-toggle front mic */
|
||||
static void alc88x_simple_mic_automute(struct hda_codec *codec)
|
||||
{
|
||||
unsigned int present;
|
||||
unsigned char bits;
|
||||
|
||||
present = snd_hda_jack_detect(codec, 0x18);
|
||||
bits = present ? HDA_AMP_MUTE : 0;
|
||||
snd_hda_codec_amp_stereo(codec, 0x0b, HDA_INPUT, 1, HDA_AMP_MUTE, bits);
|
||||
}
|
||||
|
||||
|
||||
@ -4447,6 +4447,7 @@ enum {
|
||||
ALC880_FIXUP_VOL_KNOB,
|
||||
ALC880_FIXUP_FUJITSU,
|
||||
ALC880_FIXUP_F1734,
|
||||
ALC880_FIXUP_UNIWILL,
|
||||
};
|
||||
|
||||
/* enable the volume-knob widget support on NID 0x21 */
|
||||
@ -4556,12 +4557,23 @@ static const struct alc_fixup alc880_fixups[] = {
|
||||
.chained = true,
|
||||
.chain_id = ALC880_FIXUP_VOL_KNOB,
|
||||
},
|
||||
[ALC880_FIXUP_UNIWILL] = {
|
||||
/* need to fix HP and speaker pins to be parsed correctly */
|
||||
.type = ALC_FIXUP_PINS,
|
||||
.v.pins = (const struct alc_pincfg[]) {
|
||||
{ 0x14, 0x0121411f }, /* HP */
|
||||
{ 0x15, 0x99030120 }, /* speaker */
|
||||
{ 0x16, 0x99030130 }, /* bass speaker */
|
||||
{ }
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
static const struct snd_pci_quirk alc880_fixup_tbl[] = {
|
||||
SND_PCI_QUIRK(0x1019, 0x0f69, "Coeus G610P", ALC880_FIXUP_W810),
|
||||
SND_PCI_QUIRK_VENDOR(0x1558, "Clevo", ALC880_FIXUP_EAPD_COEF),
|
||||
SND_PCI_QUIRK(0x1584, 0x9054, "Uniwill", ALC880_FIXUP_F1734),
|
||||
SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_FIXUP_UNIWILL),
|
||||
SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),
|
||||
SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),
|
||||
SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user