diff mbox series

ALSA: hda/realtek: Amp init fixup for HP ZBook 15 G6

Message ID 20211210192614.460529-1-Bradley.Scott@zebra.com (mailing list archive)
State Superseded
Headers show
Series ALSA: hda/realtek: Amp init fixup for HP ZBook 15 G6 | expand

Commit Message

Bradley Scott Dec. 10, 2021, 7:26 p.m. UTC
HP ZBook 15 G6 (SSID 103c:860f) needs the same speaker amplifier
initialization as used on several other HP laptops using ALC285.

This commit also adds a new "alc285-hp-amp-init" model that can be used
to apply this same amp init fixup to other devices by passing
"hda_model=alc285-hp-amp-init" to the snd-sof-intel-hda-common module or
"model=alc285-hp-amp-init" to the snd-hda-intel module, depending on
which is being used.

Signed-off-by: Bradley Scott <Bradley.Scott@zebra.com>
---
 Documentation/sound/hd-audio/models.rst | 2 ++
 sound/pci/hda/patch_realtek.c           | 2 ++
 2 files changed, 4 insertions(+)

--
2.25.1

Comments

Takashi Iwai Dec. 12, 2021, 8:58 a.m. UTC | #1
On Fri, 10 Dec 2021 20:26:12 +0100,
Bradley Scott wrote:
> 
> HP ZBook 15 G6 (SSID 103c:860f) needs the same speaker amplifier
> initialization as used on several other HP laptops using ALC285.
> 
> This commit also adds a new "alc285-hp-amp-init" model that can be used
> to apply this same amp init fixup to other devices by passing
> "hda_model=alc285-hp-amp-init" to the snd-sof-intel-hda-common module or
> "model=alc285-hp-amp-init" to the snd-hda-intel module, depending on
> which is being used.
> 
> Signed-off-by: Bradley Scott <Bradley.Scott@zebra.com>

Thanks for the patch.  Unfortunately, somehow your MUA broke the tabs
with spaces and the patch wasn't cleanly applicable.

Also, I prefer splitting the changes to two, the addition of a quirk
entry and the addition to the model string.  Then old stable kernels
have more chance to pick up.

Could you try to resubmit?  In the worst case, I can take the
attachments, too.


Takashi
diff mbox series

Patch

diff --git a/Documentation/sound/hd-audio/models.rst b/Documentation/sound/hd-audio/models.rst
index 0ea967d34583..d25335993e55 100644
--- a/Documentation/sound/hd-audio/models.rst
+++ b/Documentation/sound/hd-audio/models.rst
@@ -326,6 +326,8 @@  usi-headset
     Headset support on USI machines
 dual-codecs
     Lenovo laptops with dual codecs
+alc285-hp-amp-init
+    HP laptops which require speaker amplifier initialization (ALC285)

 ALC680
 ======
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 3599f4c85ebf..fc41f3e8ddc3 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8660,6 +8660,7 @@  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
        SND_PCI_QUIRK(0x103c, 0x84da, "HP OMEN dc0019-ur", ALC295_FIXUP_HP_OMEN),
        SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
        SND_PCI_QUIRK(0x103c, 0x8519, "HP Spectre x360 15-df0xxx", ALC285_FIXUP_HP_SPECTRE_X360),
+       SND_PCI_QUIRK(0x103c, 0x860f, "HP ZBook 15 G6", ALC285_FIXUP_HP_GPIO_AMP_INIT),
        SND_PCI_QUIRK(0x103c, 0x861f, "HP Elite Dragonfly G1", ALC285_FIXUP_HP_GPIO_AMP_INIT),
        SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED),
        SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO),
@@ -9123,6 +9124,7 @@  static const struct hda_model_fixup alc269_fixup_models[] = {
        {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"},
        {.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"},
        {.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},
+       {.id = ALC285_FIXUP_HP_GPIO_AMP_INIT, .name = "alc285-hp-amp-init"},
        {}
 };
 #define ALC225_STANDARD_PINS \