From 75a4ea729bbd12427f97c8caf21d34001a6aa27a Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 12 Feb 2018 13:27:24 -0800 Subject: [PATCH] Turns out the fix to enable dock sound breaks things --- dock-sound.patch | 104 ----------------------------------------------- 1 file changed, 104 deletions(-) delete mode 100644 dock-sound.patch diff --git a/dock-sound.patch b/dock-sound.patch deleted file mode 100644 index 01c973d79..000000000 --- a/dock-sound.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 61fcf8ece9b6b09450250c4ca40cc3b81a96a68d Mon Sep 17 00:00:00 2001 -From: Kailang Yang -Date: Fri, 2 Feb 2018 15:26:46 +0800 -Subject: ALSA: hda/realtek - Enable Thinkpad Dock device for ALC298 platform - -Thinkpad Dock device support for ALC298 platform. -It need to use SSID for the quirk table. -Because IdeaPad also has ALC298 platform. -Use verb for the quirk table will confuse. - -Signed-off-by: Kailang Yang -Cc: -Signed-off-by: Takashi Iwai ---- - sound/pci/hda/patch_realtek.c | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 0c61751..32938ca 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -4972,6 +4972,28 @@ static void alc_fixup_tpt440_dock(struct hda_codec *codec, - } - } - -+static void alc_fixup_tpt470_dock(struct hda_codec *codec, -+ const struct hda_fixup *fix, int action) -+{ -+ static const struct hda_pintbl pincfgs[] = { -+ { 0x17, 0x21211010 }, /* dock headphone */ -+ { 0x19, 0x21a11010 }, /* dock mic */ -+ { } -+ }; -+ struct alc_spec *spec = codec->spec; -+ -+ if (action == HDA_FIXUP_ACT_PRE_PROBE) { -+ spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP; -+ /* Enable DOCK device */ -+ snd_hda_codec_write(codec, 0x17, 0, -+ AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0); -+ /* Enable DOCK device */ -+ snd_hda_codec_write(codec, 0x19, 0, -+ AC_VERB_SET_CONFIG_DEFAULT_BYTES_3, 0); -+ snd_hda_apply_pincfgs(codec, pincfgs); -+ } -+} -+ - static void alc_shutup_dell_xps13(struct hda_codec *codec) - { - struct alc_spec *spec = codec->spec; -@@ -5446,6 +5468,7 @@ enum { - ALC700_FIXUP_INTEL_REFERENCE, - ALC274_FIXUP_DELL_BIND_DACS, - ALC274_FIXUP_DELL_AIO_LINEOUT_VERB, -+ ALC298_FIXUP_TPT470_DOCK, - }; - - static const struct hda_fixup alc269_fixups[] = { -@@ -6271,6 +6294,12 @@ static const struct hda_fixup alc269_fixups[] = { - .chained = true, - .chain_id = ALC274_FIXUP_DELL_BIND_DACS - }, -+ [ALC298_FIXUP_TPT470_DOCK] = { -+ .type = HDA_FIXUP_FUNC, -+ .v.func = alc_fixup_tpt470_dock, -+ .chained = true, -+ .chain_id = ALC293_FIXUP_LENOVO_SPK_NOISE -+ }, - }; - - static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -6452,8 +6481,16 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x17aa, 0x2218, "Thinkpad X1 Carbon 2nd", ALC292_FIXUP_TPT440_DOCK), - SND_PCI_QUIRK(0x17aa, 0x2223, "ThinkPad T550", ALC292_FIXUP_TPT440_DOCK), - SND_PCI_QUIRK(0x17aa, 0x2226, "ThinkPad X250", ALC292_FIXUP_TPT440_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x222d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x222e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), - SND_PCI_QUIRK(0x17aa, 0x2231, "Thinkpad T560", ALC292_FIXUP_TPT460), - SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460), -+ SND_PCI_QUIRK(0x17aa, 0x2245, "Thinkpad T470", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x2246, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x2247, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x224b, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), - SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), - SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), - SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), -@@ -6474,7 +6511,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460), - SND_PCI_QUIRK(0x17aa, 0x5051, "Thinkpad L460", ALC292_FIXUP_TPT460), - SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460), -+ SND_PCI_QUIRK(0x17aa, 0x505d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x505f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x5062, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), - SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), -+ SND_PCI_QUIRK(0x17aa, 0x511e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -+ SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), - SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), - SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), - SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ --- -cgit v1.1 -