From 9e28db89ffa8321f26ee961c78bad2d8c719cfb5 Mon Sep 17 00:00:00 2001
From: Chengu Wang <wangchengu@gmail.com>
Date: Thu, 30 Jul 2009 19:43:55 +0800
Subject: [PATCH] --- yaml --- r: 156383 b: refs/heads/master c:
 84d3dc200fc8b878acf7c1840b238e6a0450e4d0 h: refs/heads/master i:   156381:
 8e96983e9b6fe5e7f3f58189318dab8ea91e6526   156379:
 0242672310ab8556d453fe83dd6fe14b5832d141   156375:
 3dfd88d879450ac7bf0d7a719288dbb2223965c0   156367:
 c690c07d89470ffe7fae54acabc3a0f3bf40edf5   156351:
 9d7f6dadf2fc8cebfc67822326e3ae1dcbf7d496 v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/hda/patch_sigmatel.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3e13f2ed41b3..6dd32a53aceb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e310bb0646e57a4f9182865115c5780931456c65
+refs/heads/master: 84d3dc200fc8b878acf7c1840b238e6a0450e4d0
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
index 5383d8cff88b..456ef6ac12e4 100644
--- a/trunk/sound/pci/hda/patch_sigmatel.c
+++ b/trunk/sound/pci/hda/patch_sigmatel.c
@@ -2266,7 +2266,7 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x01f3, "Dell Inspiron 1420", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0227, "Dell Vostro 1400  ", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022e, "Dell     ", STAC_DELL_BIOS),
-	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022f, "Dell Inspiron 1525", STAC_DELL_3ST),
+	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x022f, "Dell Inspiron 1525", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0242, "Dell     ", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x0243, "Dell     ", STAC_DELL_BIOS),
 	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL,  0x02ff, "Dell     ", STAC_DELL_BIOS),
@@ -5645,6 +5645,13 @@ static int patch_stac927x(struct hda_codec *codec)
 		/* GPIO2 High = Enable EAPD */
 		spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x04;
 		spec->gpio_data = 0x04;
+		switch (codec->subsystem_id) {
+		case 0x1028022f:
+			/* correct EAPD to be GPIO0 */
+			spec->eapd_mask = spec->gpio_mask = 0x01;
+			spec->gpio_dir = spec->gpio_data = 0x01;
+			break;
+		};
 		spec->dmic_nids = stac927x_dmic_nids;
 		spec->num_dmics = STAC927X_NUM_DMICS;