ALSA: hda: fixup headset for ASUS GX502 laptop
The GX502 requires a few steps to enable the headset i/o: pincfg, verbs to enable and unmute the amp used for headpone out, and a jacksense callback to toggle output via internal or jack using a verb. Signed-off-by: Luke D Jones <luke@ljones.dev> Cc: <stable@vger.kernel.org> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=208005 Link: https://lore.kernel.org/r/20200907081959.56186-1-luke@ljones.dev Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
6a6660d049
commit
c3cdf18927
|
@ -5993,6 +5993,40 @@ static void alc_fixup_disable_mic_vref(struct hda_codec *codec,
|
||||||
snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);
|
snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void alc294_gx502_toggle_output(struct hda_codec *codec,
|
||||||
|
struct hda_jack_callback *cb)
|
||||||
|
{
|
||||||
|
/* The Windows driver sets the codec up in a very different way where
|
||||||
|
* it appears to leave 0x10 = 0x8a20 set. For Linux we need to toggle it
|
||||||
|
*/
|
||||||
|
if (snd_hda_jack_detect_state(codec, 0x21) == HDA_JACK_PRESENT)
|
||||||
|
alc_write_coef_idx(codec, 0x10, 0x8a20);
|
||||||
|
else
|
||||||
|
alc_write_coef_idx(codec, 0x10, 0x0a20);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void alc294_fixup_gx502_hp(struct hda_codec *codec,
|
||||||
|
const struct hda_fixup *fix, int action)
|
||||||
|
{
|
||||||
|
/* Pin 0x21: headphones/headset mic */
|
||||||
|
if (!is_jack_detectable(codec, 0x21))
|
||||||
|
return;
|
||||||
|
|
||||||
|
switch (action) {
|
||||||
|
case HDA_FIXUP_ACT_PRE_PROBE:
|
||||||
|
snd_hda_jack_detect_enable_callback(codec, 0x21,
|
||||||
|
alc294_gx502_toggle_output);
|
||||||
|
break;
|
||||||
|
case HDA_FIXUP_ACT_INIT:
|
||||||
|
/* Make sure to start in a correct state, i.e. if
|
||||||
|
* headphones have been plugged in before powering up the system
|
||||||
|
*/
|
||||||
|
alc294_gx502_toggle_output(codec, NULL);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void alc285_fixup_hp_gpio_amp_init(struct hda_codec *codec,
|
static void alc285_fixup_hp_gpio_amp_init(struct hda_codec *codec,
|
||||||
const struct hda_fixup *fix, int action)
|
const struct hda_fixup *fix, int action)
|
||||||
{
|
{
|
||||||
|
@ -6173,6 +6207,9 @@ enum {
|
||||||
ALC285_FIXUP_THINKPAD_HEADSET_JACK,
|
ALC285_FIXUP_THINKPAD_HEADSET_JACK,
|
||||||
ALC294_FIXUP_ASUS_HPE,
|
ALC294_FIXUP_ASUS_HPE,
|
||||||
ALC294_FIXUP_ASUS_COEF_1B,
|
ALC294_FIXUP_ASUS_COEF_1B,
|
||||||
|
ALC294_FIXUP_ASUS_GX502_HP,
|
||||||
|
ALC294_FIXUP_ASUS_GX502_PINS,
|
||||||
|
ALC294_FIXUP_ASUS_GX502_VERBS,
|
||||||
ALC285_FIXUP_HP_GPIO_LED,
|
ALC285_FIXUP_HP_GPIO_LED,
|
||||||
ALC285_FIXUP_HP_MUTE_LED,
|
ALC285_FIXUP_HP_MUTE_LED,
|
||||||
ALC236_FIXUP_HP_MUTE_LED,
|
ALC236_FIXUP_HP_MUTE_LED,
|
||||||
|
@ -7338,6 +7375,33 @@ static const struct hda_fixup alc269_fixups[] = {
|
||||||
.chained = true,
|
.chained = true,
|
||||||
.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
|
.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
|
||||||
},
|
},
|
||||||
|
[ALC294_FIXUP_ASUS_GX502_PINS] = {
|
||||||
|
.type = HDA_FIXUP_PINS,
|
||||||
|
.v.pins = (const struct hda_pintbl[]) {
|
||||||
|
{ 0x19, 0x03a11050 }, /* front HP mic */
|
||||||
|
{ 0x1a, 0x01a11830 }, /* rear external mic */
|
||||||
|
{ 0x21, 0x03211020 }, /* front HP out */
|
||||||
|
{ }
|
||||||
|
},
|
||||||
|
.chained = true,
|
||||||
|
.chain_id = ALC294_FIXUP_ASUS_GX502_VERBS
|
||||||
|
},
|
||||||
|
[ALC294_FIXUP_ASUS_GX502_VERBS] = {
|
||||||
|
.type = HDA_FIXUP_VERBS,
|
||||||
|
.v.verbs = (const struct hda_verb[]) {
|
||||||
|
/* set 0x15 to HP-OUT ctrl */
|
||||||
|
{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 },
|
||||||
|
/* unmute the 0x15 amp */
|
||||||
|
{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000 },
|
||||||
|
{ }
|
||||||
|
},
|
||||||
|
.chained = true,
|
||||||
|
.chain_id = ALC294_FIXUP_ASUS_GX502_HP
|
||||||
|
},
|
||||||
|
[ALC294_FIXUP_ASUS_GX502_HP] = {
|
||||||
|
.type = HDA_FIXUP_FUNC,
|
||||||
|
.v.func = alc294_fixup_gx502_hp,
|
||||||
|
},
|
||||||
[ALC294_FIXUP_ASUS_COEF_1B] = {
|
[ALC294_FIXUP_ASUS_COEF_1B] = {
|
||||||
.type = HDA_FIXUP_VERBS,
|
.type = HDA_FIXUP_VERBS,
|
||||||
.v.verbs = (const struct hda_verb[]) {
|
.v.verbs = (const struct hda_verb[]) {
|
||||||
|
@ -7711,6 +7775,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
||||||
SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
|
SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),
|
||||||
SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
|
SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502),
|
||||||
SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
|
SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
|
||||||
|
SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS),
|
||||||
SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
|
SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
|
||||||
SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
|
SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
|
||||||
SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
|
SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
|
||||||
|
|
Loading…
Reference in New Issue