Commit 8286c53e authored by Daniel T Chen's avatar Daniel T Chen Committed by Jaroslav Kysela

[ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty

Included is a patch against current alsa-kernel hg tip adding
quirks that Ubuntu Dapper/Edgy/Feisty contains.
Signed-off-by: default avatarDaniel T Chen <crimsun@ubuntu.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 609d7694
...@@ -1782,6 +1782,11 @@ static unsigned int ad1981_jacks_blacklist[] = { ...@@ -1782,6 +1782,11 @@ static unsigned int ad1981_jacks_blacklist[] = {
0x10140534, /* Thinkpad X31 */ 0x10140534, /* Thinkpad X31 */
0x10140537, /* Thinkpad T41p */ 0x10140537, /* Thinkpad T41p */
0x10140554, /* Thinkpad T42p/R50p */ 0x10140554, /* Thinkpad T42p/R50p */
0x10140567, /* Thinkpad T43p 2668-G7U */
0x10140581, /* Thinkpad X41-2527 */
0x104380b0, /* Asus A7V8X-MX */
0x11790241, /* Toshiba Satellite A-15 S127 */
0x144dc01a, /* Samsung NP-X20C004/SEG */
0 /* end */ 0 /* end */
}; };
......
...@@ -467,6 +467,8 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = { ...@@ -467,6 +467,8 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = {
"Dell XPS M1710", STAC_REF), "Dell XPS M1710", STAC_REF),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cf, SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01cf,
"Dell Precision M90", STAC_REF), "Dell Precision M90", STAC_REF),
SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01d6,
"unknown Dell", STAC_REF),
{} /* terminator */ {} /* terminator */
}; };
......
...@@ -1797,6 +1797,18 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { ...@@ -1797,6 +1797,18 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
.name = "Dell Unknown", /* STAC9750/51 */ .name = "Dell Unknown", /* STAC9750/51 */
.type = AC97_TUNE_HP_ONLY .type = AC97_TUNE_HP_ONLY
}, },
{
.subvendor = 0x1028,
.subdevice = 0x0186,
.name = "Dell Latitude D810", /* cf. Malone #41015 */
.type = AC97_TUNE_HP_MUTE_LED
},
{
.subvendor = 0x1028,
.subdevice = 0x0188,
.name = "Dell Inspiron 6000",
.type = AC97_TUNE_HP_MUTE_LED /* cf. Malone #41015 */
},
{ {
.subvendor = 0x1028, .subvendor = 0x1028,
.subdevice = 0x0191, .subdevice = 0x0191,
...@@ -1819,7 +1831,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { ...@@ -1819,7 +1831,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
.subvendor = 0x103c, .subvendor = 0x103c,
.subdevice = 0x088c, .subdevice = 0x088c,
.name = "HP nc8000", .name = "HP nc8000",
.type = AC97_TUNE_MUTE_LED .type = AC97_TUNE_HP_MUTE_LED
}, },
{ {
.subvendor = 0x103c, .subvendor = 0x103c,
...@@ -1911,6 +1923,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { ...@@ -1911,6 +1923,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
.name = "Fujitsu S6210", /* STAC9750/51 */ .name = "Fujitsu S6210", /* STAC9750/51 */
.type = AC97_TUNE_HP_ONLY .type = AC97_TUNE_HP_ONLY
}, },
{
.subvendor = 0x10cf,
.subdevice = 0x127e,
.name = "Fujitsu Lifebook C1211D",
.type = AC97_TUNE_HP_ONLY
},
{ {
.subvendor = 0x10cf, .subvendor = 0x10cf,
.subdevice = 0x12ec, .subdevice = 0x12ec,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment