lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: hda - Make the pin quirk tables use the SND_HDA_PIN_QUIRK macro

Browse Source 
This is cosmetical - it makes the pin quirk table look better.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
David Henningsson
2014-06-24 14:46:54 +02:00
committed by Takashi Iwai
parent a2d2fa02b2
commit 76c2132ec9
1 changed files with 183 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

510
sound/pci/hda/patch_realtek.c
View File

@@ -4962,228 +4962,129 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
}; };
static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{ SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
.codec = 0x10ec0255, {0x12, 0x90a60140},
.subvendor = 0x1028, {0x14, 0x90170110},
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x17, 0x40000000},
.name = "Dell", {0x18, 0x411111f0},
#endif {0x19, 0x411111f0},
.pins = (const struct hda_pintbl[]) { {0x1a, 0x411111f0},
{0x12, 0x90a60140}, {0x1b, 0x411111f0},
{0x14, 0x90170110}, {0x1d, 0x40700001},
{0x17, 0x40000000}, {0x1e, 0x411111f0},
{0x18, 0x411111f0}, {0x21, 0x02211020}),
{0x19, 0x411111f0}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
{0x1a, 0x411111f0}, {0x12, 0x90a60160},
{0x1b, 0x411111f0}, {0x14, 0x90170120},
{0x1d, 0x40700001}, {0x17, 0x40000000},
{0x1e, 0x411111f0}, {0x18, 0x411111f0},
{0x21, 0x02211020}, {0x19, 0x411111f0},
}, {0x1a, 0x411111f0},
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x1b, 0x411111f0},
}, {0x1d, 0x40700001},
{ {0x1e, 0x411111f0},
.codec = 0x10ec0255, {0x21, 0x02211030}),
.subvendor = 0x1028, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x12, 0x90a60160},
.name = "Dell", {0x14, 0x90170120},
#endif {0x17, 0x90170140},
.pins = (const struct hda_pintbl[]) { {0x18, 0x40000000},
{0x12, 0x90a60160}, {0x19, 0x411111f0},
{0x14, 0x90170120}, {0x1a, 0x411111f0},
{0x17, 0x40000000}, {0x1b, 0x411111f0},
{0x18, 0x411111f0}, {0x1d, 0x41163b05},
{0x19, 0x411111f0}, {0x1e, 0x411111f0},
{0x1a, 0x411111f0}, {0x21, 0x0321102f}),
{0x1b, 0x411111f0}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
{0x1d, 0x40700001}, {0x12, 0x90a60160},
{0x1e, 0x411111f0}, {0x14, 0x90170130},
{0x21, 0x02211030}, {0x17, 0x40000000},
}, {0x18, 0x411111f0},
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x19, 0x411111f0},
}, {0x1a, 0x411111f0},
{ {0x1b, 0x411111f0},
.codec = 0x10ec0255, {0x1d, 0x40700001},
.subvendor = 0x1028, {0x1e, 0x411111f0},
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x21, 0x02211040}),
.name = "Dell", SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
#endif {0x12, 0x90a60160},
.pins = (const struct hda_pintbl[]) { {0x14, 0x90170140},
{0x12, 0x90a60160}, {0x17, 0x40000000},
{0x14, 0x90170120}, {0x18, 0x411111f0},
{0x17, 0x90170140}, {0x19, 0x411111f0},
{0x18, 0x40000000}, {0x1a, 0x411111f0},
{0x19, 0x411111f0}, {0x1b, 0x411111f0},
{0x1a, 0x411111f0}, {0x1d, 0x40700001},
{0x1b, 0x411111f0}, {0x1e, 0x411111f0},
{0x1d, 0x41163b05}, {0x21, 0x02211050}),
{0x1e, 0x411111f0}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
{0x21, 0x0321102f}, {0x12, 0x90a60170},
}, {0x14, 0x90170120},
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x17, 0x40000000},
}, {0x18, 0x411111f0},
{ {0x19, 0x411111f0},
.codec = 0x10ec0255, {0x1a, 0x411111f0},
.subvendor = 0x1028, {0x1b, 0x411111f0},
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x1d, 0x40700001},
.name = "Dell", {0x1e, 0x411111f0},
#endif {0x21, 0x02211030}),
.pins = (const struct hda_pintbl[]) { SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
{0x12, 0x90a60160}, {0x12, 0x90a60170},
{0x14, 0x90170130}, {0x14, 0x90170130},
{0x17, 0x40000000}, {0x17, 0x40000000},
{0x18, 0x411111f0}, {0x18, 0x411111f0},
{0x19, 0x411111f0}, {0x19, 0x411111f0},
{0x1a, 0x411111f0}, {0x1a, 0x411111f0},
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x02211040}, {0x21, 0x02211040}),
}, SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60130},
}, {0x14, 0x90170110},
{ {0x17, 0x40020008},
.codec = 0x10ec0255, {0x18, 0x411111f0},
.subvendor = 0x1028, {0x19, 0x411111f0},
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x1a, 0x411111f0},
.name = "Dell", {0x1b, 0x411111f0},
#endif {0x1d, 0x40e00001},
.pins = (const struct hda_pintbl[]) { {0x1e, 0x411111f0},
{0x12, 0x90a60160}, {0x21, 0x0321101f}),
{0x14, 0x90170140}, SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
{0x17, 0x40000000}, {0x12, 0x90a60160},
{0x18, 0x411111f0}, {0x14, 0x90170120},
{0x19, 0x411111f0}, {0x17, 0x40000000},
{0x1a, 0x411111f0}, {0x18, 0x411111f0},
{0x1b, 0x411111f0}, {0x19, 0x411111f0},
{0x1d, 0x40700001}, {0x1a, 0x411111f0},
{0x1e, 0x411111f0}, {0x1b, 0x411111f0},
{0x21, 0x02211050}, {0x1d, 0x40700001},
}, {0x1e, 0x411111f0},
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x21, 0x02211030}),
}, SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
{ {0x12, 0x90a60140},
.codec = 0x10ec0255, {0x13, 0x411111f0},
.subvendor = 0x1028, {0x14, 0x90170110},
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x15, 0x0221401f},
.name = "Dell", {0x16, 0x411111f0},
#endif {0x18, 0x411111f0},
.pins = (const struct hda_pintbl[]) { {0x19, 0x411111f0},
{0x12, 0x90a60170}, {0x1a, 0x411111f0},
{0x14, 0x90170120}, {0x1b, 0x411111f0},
{0x17, 0x40000000}, {0x1d, 0x40700001},
{0x18, 0x411111f0}, {0x1e, 0x411111f0}),
{0x19, 0x411111f0}, SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
{0x1a, 0x411111f0}, {0x12, 0x40000000},
{0x1b, 0x411111f0}, {0x13, 0x90a60140},
{0x1d, 0x40700001}, {0x14, 0x90170110},
{0x1e, 0x411111f0}, {0x15, 0x0221401f},
{0x21, 0x02211030}, {0x16, 0x21014020},
}, {0x18, 0x411111f0},
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x19, 0x21a19030},
}, {0x1a, 0x411111f0},
{ {0x1b, 0x411111f0},
.codec = 0x10ec0255, {0x1d, 0x40700001},
.subvendor = 0x1028, {0x1e, 0x411111f0}),
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60170},
{0x14, 0x90170130},
{0x17, 0x40000000},
{0x18, 0x411111f0},
{0x19, 0x411111f0},
{0x1a, 0x411111f0},
{0x1b, 0x411111f0},
{0x1d, 0x40700001},
{0x1e, 0x411111f0},
{0x21, 0x02211040},
},
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0283,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60130},
{0x14, 0x90170110},
{0x17, 0x40020008},
{0x18, 0x411111f0},
{0x19, 0x411111f0},
{0x1a, 0x411111f0},
{0x1b, 0x411111f0},
{0x1d, 0x40e00001},
{0x1e, 0x411111f0},
{0x21, 0x0321101f},
},
.value = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0283,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60160},
{0x14, 0x90170120},
{0x17, 0x40000000},
{0x18, 0x411111f0},
{0x19, 0x411111f0},
{0x1a, 0x411111f0},
{0x1b, 0x411111f0},
{0x1d, 0x40700001},
{0x1e, 0x411111f0},
{0x21, 0x02211030},
},
.value = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0292,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60140},
{0x13, 0x411111f0},
{0x14, 0x90170110},
{0x15, 0x0221401f},
{0x16, 0x411111f0},
{0x18, 0x411111f0},
{0x19, 0x411111f0},
{0x1a, 0x411111f0},
{0x1b, 0x411111f0},
{0x1d, 0x40700001},
{0x1e, 0x411111f0},
},
.value = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0293,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x40000000},
{0x13, 0x90a60140},
{0x14, 0x90170110},
{0x15, 0x0221401f},
{0x16, 0x21014020},
{0x18, 0x411111f0},
{0x19, 0x21a19030},
{0x1a, 0x411111f0},
{0x1b, 0x411111f0},
{0x1d, 0x40700001},
{0x1e, 0x411111f0},
},
.value = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{} {}
}; };
@@ -6039,111 +5940,66 @@ static const struct hda_model_fixup alc662_fixup_models[] = {
}; };
static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
{ SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
.codec = 0x10ec0668, {0x12, 0x99a30130},
.subvendor = 0x1028, {0x14, 0x90170110},
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x15, 0x0321101f},
.name = "Dell", {0x16, 0x03011020},
#endif {0x18, 0x40000008},
.pins = (const struct hda_pintbl[]) { {0x19, 0x411111f0},
{0x12, 0x99a30130}, {0x1a, 0x411111f0},
{0x14, 0x90170110}, {0x1b, 0x411111f0},
{0x15, 0x0321101f}, {0x1d, 0x41000001},
{0x16, 0x03011020}, {0x1e, 0x411111f0},
{0x18, 0x40000008}, {0x1f, 0x411111f0}),
{0x19, 0x411111f0}, SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
{0x1a, 0x411111f0}, {0x12, 0x99a30140},
{0x1b, 0x411111f0}, {0x14, 0x90170110},
{0x1d, 0x41000001}, {0x15, 0x0321101f},
{0x1e, 0x411111f0}, {0x16, 0x03011020},
{0x1f, 0x411111f0}, {0x18, 0x40000008},
}, {0x19, 0x411111f0},
.value = ALC668_FIXUP_AUTO_MUTE, {0x1a, 0x411111f0},
}, {0x1b, 0x411111f0},
{ {0x1d, 0x41000001},
.codec = 0x10ec0668, {0x1e, 0x411111f0},
.subvendor = 0x1028, {0x1f, 0x411111f0}),
#ifdef CONFIG_SND_DEBUG_VERBOSE SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
.name = "Dell", {0x12, 0x99a30150},
#endif {0x14, 0x90170110},
.pins = (const struct hda_pintbl[]) { {0x15, 0x0321101f},
{0x12, 0x99a30140}, {0x16, 0x03011020},
{0x14, 0x90170110}, {0x18, 0x40000008},
{0x15, 0x0321101f}, {0x19, 0x411111f0},
{0x16, 0x03011020}, {0x1a, 0x411111f0},
{0x18, 0x40000008}, {0x1b, 0x411111f0},
{0x19, 0x411111f0}, {0x1d, 0x41000001},
{0x1a, 0x411111f0}, {0x1e, 0x411111f0},
{0x1b, 0x411111f0}, {0x1f, 0x411111f0}),
{0x1d, 0x41000001}, SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
{0x1e, 0x411111f0}, {0x12, 0x411111f0},
{0x1f, 0x411111f0}, {0x14, 0x90170110},
}, {0x15, 0x0321101f},
.value = ALC668_FIXUP_AUTO_MUTE, {0x16, 0x03011020},
}, {0x18, 0x40000008},
{ {0x19, 0x411111f0},
.codec = 0x10ec0668, {0x1a, 0x411111f0},
.subvendor = 0x1028, {0x1b, 0x411111f0},
#ifdef CONFIG_SND_DEBUG_VERBOSE {0x1d, 0x41000001},
.name = "Dell", {0x1e, 0x411111f0},
#endif {0x1f, 0x411111f0}),
.pins = (const struct hda_pintbl[]) { SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell XPS 15", ALC668_FIXUP_AUTO_MUTE,
{0x12, 0x99a30150}, {0x12, 0x90a60130},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x15, 0x0321101f}, {0x15, 0x0321101f},
{0x16, 0x03011020}, {0x16, 0x40000000},
{0x18, 0x40000008}, {0x18, 0x411111f0},
{0x19, 0x411111f0}, {0x19, 0x411111f0},
{0x1a, 0x411111f0}, {0x1a, 0x411111f0},
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x41000001}, {0x1d, 0x40d6832d},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x1f, 0x411111f0}, {0x1f, 0x411111f0}),
},
.value = ALC668_FIXUP_AUTO_MUTE,
},
{
.codec = 0x10ec0668,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x411111f0},
{0x14, 0x90170110},
{0x15, 0x0321101f},
{0x16, 0x03011020},
{0x18, 0x40000008},
{0x19, 0x411111f0},
{0x1a, 0x411111f0},
{0x1b, 0x411111f0},
{0x1d, 0x41000001},
{0x1e, 0x411111f0},
{0x1f, 0x411111f0},
},
.value = ALC668_FIXUP_AUTO_MUTE,
},
{
.codec = 0x10ec0668,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell XPS 15",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60130},
{0x14, 0x90170110},
{0x15, 0x0321101f},
{0x16, 0x40000000},
{0x18, 0x411111f0},
{0x19, 0x411111f0},
{0x1a, 0x411111f0},
{0x1b, 0x411111f0},
{0x1d, 0x40d6832d},
{0x1e, 0x411111f0},
{0x1f, 0x411111f0},
},
.value = ALC668_FIXUP_AUTO_MUTE,
},
{} {}
}; };