diff mbox series

[linux-oem,v3,2/4] Revert "UBUNTU: SAUCE: ALSA: hda/realtek - Add support headset mode for DELL WYSE"

Message ID 20180312063510.26505-3-jesse.sung@canonical.com
State New
Headers show
Series None | expand

Commit Message

Wen-chien Jesse Sung March 12, 2018, 6:35 a.m. UTC
BugLink: https://launchpad.net/bugs/1723913

This reverts commit ce30ef771146fbc79b893ce936bd24cb3b33b70e in order to
cherry-pick an update from upstream.

Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
---
 sound/pci/hda/patch_realtek.c | 13 -------------
 1 file changed, 13 deletions(-)
diff mbox series

Patch

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7ac9c2a4c2f8..f39027698738 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5309,7 +5309,6 @@  enum {
 	ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE,
 	ALC233_FIXUP_LENOVO_MULTI_CODECS,
 	ALC294_FIXUP_LENOVO_MIC_LOCATION,
-	ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE,
 	ALC274_FIXUP_DELL_BIND_DACS,
 	ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
 };
@@ -6107,17 +6106,6 @@  static const struct hda_fixup alc269_fixups[] = {
 			{ }
 		},
 	},
-	[ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE] = {
-		.type = HDA_FIXUP_PINS,
-		.v.pins = (const struct hda_pintbl[]) {
-			{ 0x16, 0x0101102f }, /* Rear Headset HP */
-			{ 0x19, 0x02a1913c }, /* use as Front headset mic, without its own jack detect */
-			{ 0x1a, 0x01a19030 }, /* Rear Headset MIC */
-			{ }
-		},
-		.chained = true,
-		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
-	},
 	[ALC274_FIXUP_DELL_BIND_DACS] = {
 		.type = HDA_FIXUP_FUNC,
 		.v.func = alc274_fixup_bind_dacs,
@@ -6182,7 +6170,6 @@  static const struct snd_pci_quirk alc269_fixup_tbl[] = {
 	SND_PCI_QUIRK(0x1028, 0x075b, "Dell XPS 13 9360", ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE),
 	SND_PCI_QUIRK(0x1028, 0x075d, "Dell AIO", ALC298_FIXUP_SPK_VOLUME),
 	SND_PCI_QUIRK(0x1028, 0x0798, "Dell Inspiron 17 7000 Gaming", ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER),
-	SND_PCI_QUIRK(0x1028, 0x080c, "Dell WYSE", ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
 	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),