This ThinkCentre machine has a new realtek codec alc222, it is not in the support list, we add it in the realtek.c then this machine can apply FIXUPs for the realtek codec.
And this machine has two front mics which can't be handled by PA so far, it uses the pin 0x18 and 0x19 as the front mics, as a result the existing FIXUP ALC294_FIXUP_LENOVO_MIC_LOCATION doesn't work on this machine. Fortunately another FIXUP ALC283_FIXUP_HEADSET_MIC also can change the location for one of the two mics on this machine.
Cc: stable@vger.kernel.org Signed-off-by: Hui Wang hui.wang@canonical.com --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3b9583aa63c1..74697c1dd1d5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7151,6 +7151,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x312a, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), + SND_PCI_QUIRK(0x17aa, 0x3151, "ThinkCentre Station", ALC283_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI), @@ -9038,6 +9039,7 @@ static int patch_alc680(struct hda_codec *codec) static const struct hda_device_id snd_hda_id_realtek[] = { HDA_CODEC_ENTRY(0x10ec0215, "ALC215", patch_alc269), HDA_CODEC_ENTRY(0x10ec0221, "ALC221", patch_alc269), + HDA_CODEC_ENTRY(0x10ec0222, "ALC222", patch_alc269), HDA_CODEC_ENTRY(0x10ec0225, "ALC225", patch_alc269), HDA_CODEC_ENTRY(0x10ec0231, "ALC231", patch_alc269), HDA_CODEC_ENTRY(0x10ec0233, "ALC233", patch_alc269),
On Wed, 04 Sep 2019 07:53:27 +0200, Hui Wang wrote:
This ThinkCentre machine has a new realtek codec alc222, it is not in the support list, we add it in the realtek.c then this machine can apply FIXUPs for the realtek codec.
And this machine has two front mics which can't be handled by PA so far, it uses the pin 0x18 and 0x19 as the front mics, as a result the existing FIXUP ALC294_FIXUP_LENOVO_MIC_LOCATION doesn't work on this machine. Fortunately another FIXUP ALC283_FIXUP_HEADSET_MIC also can change the location for one of the two mics on this machine.
Cc: stable@vger.kernel.org Signed-off-by: Hui Wang hui.wang@canonical.com
Thanks, applied now.
Takashi
Hi,
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.2.11, v4.19.69, v4.14.141, v4.9.190, v4.4.190.
v5.2.11: Build OK! v4.19.69: Build OK! v4.14.141: Build OK! v4.9.190: Failed to apply! Possible dependencies: 216d7aebbfbe ("ALSA: hda/realtek - Fix headset mic and speaker on Asus X441SA/X441UV") 5824ce8de7b1 ("ALSA: hda/realtek - Add support for Acer Aspire E5-475 headset mic") 615966adc4b6 ("ALSA: hda/realtek - Fix headset mic on several Asus laptops with ALC255") 823ff161fe51 ("ALSA: hda - Fix click noises on Samsung Ativ Book 8") 8da5bbfc7cbb ("ALSA: hda - change the location for one mic on a Lenovo machine") 9eb5d0e635eb ("ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform") c1732ede5e80 ("ALSA: hda/realtek - Fix headset and mic on several Asus laptops with ALC256") c6790c8e770c ("ALSA: hda/realtek - Add support for headset MIC for ALC622") ca169cc2f9e1 ("ALSA: hda/realtek - Add Dual Codecs support for Lenovo P520/420") f33f79f3d0e5 ("ALSA: hda/realtek - change the location for one of two front microphones")
v4.4.190: Failed to apply! Possible dependencies: 1a3f099101b8 ("ALSA: hda - Fix surround output pins for ASRock B150M mobo") 216d7aebbfbe ("ALSA: hda/realtek - Fix headset mic and speaker on Asus X441SA/X441UV") 5824ce8de7b1 ("ALSA: hda/realtek - Add support for Acer Aspire E5-475 headset mic") 615966adc4b6 ("ALSA: hda/realtek - Fix headset mic on several Asus laptops with ALC255") 78f4f7c2341f ("ALSA: hda/realtek - ALC891 headset mode for Dell") 823ff161fe51 ("ALSA: hda - Fix click noises on Samsung Ativ Book 8") 8da5bbfc7cbb ("ALSA: hda - change the location for one mic on a Lenovo machine") 9b51fe3efe4c ("ALSA: hda - On-board speaker fixup on ACER Veriton") 9eb5d0e635eb ("ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform") abaa2274811d ("ALSA: hda/realtek - fix headset mic detection for MSI MS-B120") c1732ede5e80 ("ALSA: hda/realtek - Fix headset and mic on several Asus laptops with ALC256") c6790c8e770c ("ALSA: hda/realtek - Add support for headset MIC for ALC622") ca169cc2f9e1 ("ALSA: hda/realtek - Add Dual Codecs support for Lenovo P520/420") f33f79f3d0e5 ("ALSA: hda/realtek - change the location for one of two front microphones")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
-- Thanks, Sasha
Let's drop this patch to v4.9.190 and v4.4.190, it is fine to apply to v5.2.11, v4.19.69 and v4.14.141 only.
Thanks.
On 2019/9/4 下午8:35, Sasha Levin wrote:
Hi,
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.2.11, v4.19.69, v4.14.141, v4.9.190, v4.4.190.
v5.2.11: Build OK! v4.19.69: Build OK! v4.14.141: Build OK! v4.9.190: Failed to apply! Possible dependencies: 216d7aebbfbe ("ALSA: hda/realtek - Fix headset mic and speaker on Asus X441SA/X441UV") 5824ce8de7b1 ("ALSA: hda/realtek - Add support for Acer Aspire E5-475 headset mic") 615966adc4b6 ("ALSA: hda/realtek - Fix headset mic on several Asus laptops with ALC255") 823ff161fe51 ("ALSA: hda - Fix click noises on Samsung Ativ Book 8") 8da5bbfc7cbb ("ALSA: hda - change the location for one mic on a Lenovo machine") 9eb5d0e635eb ("ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform") c1732ede5e80 ("ALSA: hda/realtek - Fix headset and mic on several Asus laptops with ALC256") c6790c8e770c ("ALSA: hda/realtek - Add support for headset MIC for ALC622") ca169cc2f9e1 ("ALSA: hda/realtek - Add Dual Codecs support for Lenovo P520/420") f33f79f3d0e5 ("ALSA: hda/realtek - change the location for one of two front microphones")
v4.4.190: Failed to apply! Possible dependencies: 1a3f099101b8 ("ALSA: hda - Fix surround output pins for ASRock B150M mobo") 216d7aebbfbe ("ALSA: hda/realtek - Fix headset mic and speaker on Asus X441SA/X441UV") 5824ce8de7b1 ("ALSA: hda/realtek - Add support for Acer Aspire E5-475 headset mic") 615966adc4b6 ("ALSA: hda/realtek - Fix headset mic on several Asus laptops with ALC255") 78f4f7c2341f ("ALSA: hda/realtek - ALC891 headset mode for Dell") 823ff161fe51 ("ALSA: hda - Fix click noises on Samsung Ativ Book 8") 8da5bbfc7cbb ("ALSA: hda - change the location for one mic on a Lenovo machine") 9b51fe3efe4c ("ALSA: hda - On-board speaker fixup on ACER Veriton") 9eb5d0e635eb ("ALSA: hda/realtek - Add support headphone Mic for ALC221 of HP platform") abaa2274811d ("ALSA: hda/realtek - fix headset mic detection for MSI MS-B120") c1732ede5e80 ("ALSA: hda/realtek - Fix headset and mic on several Asus laptops with ALC256") c6790c8e770c ("ALSA: hda/realtek - Add support for headset MIC for ALC622") ca169cc2f9e1 ("ALSA: hda/realtek - Add Dual Codecs support for Lenovo P520/420") f33f79f3d0e5 ("ALSA: hda/realtek - change the location for one of two front microphones")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
-- Thanks, Sasha
linux-stable-mirror@lists.linaro.org
-
Hui Wang -
Sasha Levin -
Takashi Iwai