Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "ALSA: hda/conexant: Fix conflicting quirk for System76 Pangolin"

Browse source 
This reverts commit ddcb438ef7.
This commit is contained in:
Ksawlii 2024-11-24 00:23:11 +01:00
parent 96a727b0c0
commit baca50617e
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sound/pci/hda/patch_conexant.c
View file

@ -747,23 +747,6 @@ static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {
{} {}
}; };
/* pincfg quirk for Tuxedo Sirius;
* unfortunately the (PCI) SSID conflicts with System76 Pangolin pang14,
* which has incompatible pin setup, so we check the codec SSID (luckily
* different one!) and conditionally apply the quirk here
*/
static void cxt_fixup_sirius_top_speaker(struct hda_codec *codec,
const struct hda_fixup *fix,
int action)
{
/* ignore for incorrectly picked-up pang14 */
if (codec->core.subsystem_id == 0x278212b3)
return;
/* set up the top speaker pin */
if (action == HDA_FIXUP_ACT_PRE_PROBE)
snd_hda_codec_set_pincfg(codec, 0x1d, 0x82170111);
}
static const struct hda_fixup cxt_fixups[] = { static const struct hda_fixup cxt_fixups[] = {
[CXT_PINCFG_LENOVO_X200] = { [CXT_PINCFG_LENOVO_X200] = {
.type = HDA_FIXUP_PINS, .type = HDA_FIXUP_PINS,
@ -924,8 +907,11 @@ static const struct hda_fixup cxt_fixups[] = {
.v.pins = cxt_pincfg_sws_js201d, .v.pins = cxt_pincfg_sws_js201d,
}, },
[CXT_PINCFG_TOP_SPEAKER] = { [CXT_PINCFG_TOP_SPEAKER] = {
.type = HDA_FIXUP_FUNC, .type = HDA_FIXUP_PINS,
.v.func = cxt_fixup_sirius_top_speaker, .v.pins = (const struct hda_pintbl[]) {
{ 0x1d, 0x82170111 },
{ }
},
}, },
}; };