Skip to content

L
linux
Commit 76c2132e authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files
Options

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

This is cosmetical - it makes the pin quirk table look better.
Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a2d2fa02
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 327 deletions
sound/pci/hda/patch_realtek.c
View file @ 76c2132e
...@@ -4962,13 +4962,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { ...@@ -4962,13 +4962,7 @@ 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,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60140}, {0x12, 0x90a60140},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x17, 0x40000000}, {0x17, 0x40000000},
...@@ -4978,17 +4972,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -4978,17 +4972,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x02211020}, {0x21, 0x02211020}),
}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0255,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60160}, {0x12, 0x90a60160},
{0x14, 0x90170120}, {0x14, 0x90170120},
{0x17, 0x40000000}, {0x17, 0x40000000},
...@@ -4998,17 +4983,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -4998,17 +4983,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x02211030}, {0x21, 0x02211030}),
}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0255,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60160}, {0x12, 0x90a60160},
{0x14, 0x90170120}, {0x14, 0x90170120},
{0x17, 0x90170140}, {0x17, 0x90170140},
...@@ -5018,17 +4994,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5018,17 +4994,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x41163b05}, {0x1d, 0x41163b05},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x0321102f}, {0x21, 0x0321102f}),
}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0255,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60160}, {0x12, 0x90a60160},
{0x14, 0x90170130}, {0x14, 0x90170130},
{0x17, 0x40000000}, {0x17, 0x40000000},
...@@ -5038,17 +5005,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5038,17 +5005,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x02211040}, {0x21, 0x02211040}),
}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0255,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60160}, {0x12, 0x90a60160},
{0x14, 0x90170140}, {0x14, 0x90170140},
{0x17, 0x40000000}, {0x17, 0x40000000},
...@@ -5058,17 +5016,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5058,17 +5016,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x02211050}, {0x21, 0x02211050}),
}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0255,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60170}, {0x12, 0x90a60170},
{0x14, 0x90170120}, {0x14, 0x90170120},
{0x17, 0x40000000}, {0x17, 0x40000000},
...@@ -5078,17 +5027,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5078,17 +5027,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x02211030}, {0x21, 0x02211030}),
}, SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
.value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{
.codec = 0x10ec0255,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60170}, {0x12, 0x90a60170},
{0x14, 0x90170130}, {0x14, 0x90170130},
{0x17, 0x40000000}, {0x17, 0x40000000},
...@@ -5098,17 +5038,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5098,17 +5038,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{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,
},
{
.codec = 0x10ec0283,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x90a60130}, {0x12, 0x90a60130},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x17, 0x40020008}, {0x17, 0x40020008},
...@@ -5118,17 +5049,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5118,17 +5049,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40e00001}, {0x1d, 0x40e00001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x0321101f}, {0x21, 0x0321101f}),
}, SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
.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}, {0x12, 0x90a60160},
{0x14, 0x90170120}, {0x14, 0x90170120},
{0x17, 0x40000000}, {0x17, 0x40000000},
...@@ -5138,17 +5060,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5138,17 +5060,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x21, 0x02211030}, {0x21, 0x02211030}),
}, SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
.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}, {0x12, 0x90a60140},
{0x13, 0x411111f0}, {0x13, 0x411111f0},
{0x14, 0x90170110}, {0x14, 0x90170110},
...@@ -5159,17 +5072,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5159,17 +5072,8 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1a, 0x411111f0}, {0x1a, 0x411111f0},
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0}),
}, SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
.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}, {0x12, 0x40000000},
{0x13, 0x90a60140}, {0x13, 0x90a60140},
{0x14, 0x90170110}, {0x14, 0x90170110},
...@@ -5180,10 +5084,7 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { ...@@ -5180,10 +5084,7 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
{0x1a, 0x411111f0}, {0x1a, 0x411111f0},
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40700001}, {0x1d, 0x40700001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0}),
},
.value = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
},
{} {}
}; };
...@@ -6039,13 +5940,7 @@ static const struct hda_model_fixup alc662_fixup_models[] = { ...@@ -6039,13 +5940,7 @@ 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,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x99a30130}, {0x12, 0x99a30130},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x15, 0x0321101f}, {0x15, 0x0321101f},
...@@ -6056,17 +5951,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { ...@@ -6056,17 +5951,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x41000001}, {0x1d, 0x41000001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x1f, 0x411111f0}, {0x1f, 0x411111f0}),
}, SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
.value = ALC668_FIXUP_AUTO_MUTE,
},
{
.codec = 0x10ec0668,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x99a30140}, {0x12, 0x99a30140},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x15, 0x0321101f}, {0x15, 0x0321101f},
...@@ -6077,17 +5963,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { ...@@ -6077,17 +5963,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x41000001}, {0x1d, 0x41000001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x1f, 0x411111f0}, {0x1f, 0x411111f0}),
}, SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
.value = ALC668_FIXUP_AUTO_MUTE,
},
{
.codec = 0x10ec0668,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x99a30150}, {0x12, 0x99a30150},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x15, 0x0321101f}, {0x15, 0x0321101f},
...@@ -6098,17 +5975,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { ...@@ -6098,17 +5975,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x41000001}, {0x1d, 0x41000001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x1f, 0x411111f0}, {0x1f, 0x411111f0}),
}, SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
.value = ALC668_FIXUP_AUTO_MUTE,
},
{
.codec = 0x10ec0668,
.subvendor = 0x1028,
#ifdef CONFIG_SND_DEBUG_VERBOSE
.name = "Dell",
#endif
.pins = (const struct hda_pintbl[]) {
{0x12, 0x411111f0}, {0x12, 0x411111f0},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x15, 0x0321101f}, {0x15, 0x0321101f},
...@@ -6119,17 +5987,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { ...@@ -6119,17 +5987,8 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x41000001}, {0x1d, 0x41000001},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x1f, 0x411111f0}, {0x1f, 0x411111f0}),
}, SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell XPS 15", ALC668_FIXUP_AUTO_MUTE,
.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}, {0x12, 0x90a60130},
{0x14, 0x90170110}, {0x14, 0x90170110},
{0x15, 0x0321101f}, {0x15, 0x0321101f},
...@@ -6140,10 +5999,7 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { ...@@ -6140,10 +5999,7 @@ static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
{0x1b, 0x411111f0}, {0x1b, 0x411111f0},
{0x1d, 0x40d6832d}, {0x1d, 0x40d6832d},
{0x1e, 0x411111f0}, {0x1e, 0x411111f0},
{0x1f, 0x411111f0}, {0x1f, 0x411111f0}),
},
.value = ALC668_FIXUP_AUTO_MUTE,
},
{} {}
}; };
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7