ALSA: hda/conexant: fix Z60MR100 startup pop issue
PATCH 1/1 ALSA: hda/conexant: fix Z60MR100 startup pop issue
When Z60MR100 startup, speaker will output a pop. To fix this issue, we mute codec in bios when startup, and use GPIO1 to unmute codec in codec driver.
Signed-off-by bo liu <[email protected]>
--- sound/pci/hda/patch_conexant.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
sound/pci/hda/patch_conexant.c +19 -0
@@ -308,6 +308,7 @@ enum {CXT_FIXUP_HP_MIC_NO_PRESENCE ,CXT_PINCFG_SWS_JS201D ,CXT_PINCFG_TOP_SPEAKER , + CXT_FIXUP_HP_A_U, };/* for hda_fixup_thinkpad_acpi() */
@@ -776,6 +777,18 @@ static void cxt_fixup_hp_zbook_mute_led(struct hda_codec *codec,cxt_setup_mute_led (codec,0x10 ,0x20 ); } +static void cxt_fixup_hp_a_u (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +if (action ==HDA_FIXUP_ACT_INIT ) { +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DATA ,0 ); +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_MASK ,2 ); +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DIRECTION ,2 ); +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_STICKY_MASK ,0 ); + } + +} +/* ThinkPad X200 & co with cxt5051 */ static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = { {0x16 ,0x042140ff },/* HP (seq# overridden) */
@@ -982,6 +995,10 @@ static const struct hda_fixup cxt_fixups[] = { { } }, }, + [CXT_FIXUP_HP_A_U ] = { + .type =HDA_FIXUP_FUNC , + .v.func = cxt_fixup_hp_a_u, + }, };static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -1055,6 +1072,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x103c ,0x8457 ,"HP Z2 G4 mini" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x103c ,0x8458 ,"HP Z2 G4 mini premium" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x138d ,"Asus" ,CXT_FIXUP_HEADPHONE_MIC_PIN ), +SND_PCI_QUIRK (0x14f1 ,0x0252 ,"MBX-Z60MR100" ,CXT_FIXUP_HP_A_U ),SND_PCI_QUIRK (0x14f1 ,0x0265 ,"SWS JS201D" ,CXT_PINCFG_SWS_JS201D ),SND_PCI_QUIRK (0x152d ,0x0833 ,"OLPC XO-1.5" ,CXT_FIXUP_OLPC_XO ), SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),
@@ -1100,6 +1118,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = { { .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" }, { .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" }, { .id = CXT_PINCFG_TOP_SPEAKER, .name = "sirius-top-speaker" }, + { .id = CXT_FIXUP_HP_A_U, .name = "HP-U-support" }, {} };
Signature · 1 line
2.34.1
Quoted 25 lines · bo liu
When Z60MR100 startup, speaker will output a pop. To fix this issue, we mute codec in bios when startup, and use GPIO1 to unmute codec in codec driver.
Signed-off-by bo liu <[email protected]>--- sound/pci/hda/patch_conexant.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)sound/pci/hda/patch_conexant.c +1
-0@@ -308,6 +308,7 @@ enum {CXT_FIXUP_HP_MIC_NO_PRESENCE ,CXT_PINCFG_SWS_JS201D ,CXT_PINCFG_TOP_SPEAKER , + CXT_FIXUP_HP_A_U, };/* for hda_fixup_thinkpad_acpi() */ @@ -776,6 +777,18 @@ static void cxt_fixup_hp_zbook_mute_led(struct hda_codec *codec,cxt_setup_mute_led (codec,0x10 ,0x20 ); }
sound/pci/hda/patch_conexant.c static void cxt_fixup_hp_zbook_mute_led(struct hda_codec *codec, · line 788
Quoted 10 lines
sound/pci/hda/patch_conexant.c +9
-0+static void cxt_fixup_hp_a_u (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +if (action ==HDA_FIXUP_ACT_INIT ) { +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DATA ,0 ); +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_MASK ,2 ); +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DIRECTION ,2 ); +snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_STICKY_MASK ,0 ); + }
The GPIO bits can be manipulated for LEDs, and that would override this setup. It'd be better to define something like spec->gpio_static_mask and set it in cxt_init_gpio_led().
thanks,
Takashi