aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2014-06-24 08:46:54 -0400
committerTakashi Iwai <tiwai@suse.de>2014-06-24 08:48:34 -0400
commit76c2132ec9805120eb724cae4d2a8d30af27b3fd (patch)
tree373b5b7c9007bfecf93e0d403ad10fc94d7e8f21
parenta2d2fa02b2ec87609295a5bf2391a52e6e7ae111 (diff)
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: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat
-rw-r--r--sound/pci/hda/patch_realtek.c510
1 files changed, 183 insertions, 327 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a153d641797b..1c654effcd1a 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4962,228 +4962,129 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
4962}; 4962};
4963 4963
4964static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 4964static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
4965 { 4965 SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
4966 .codec = 0x10ec0255, 4966 {0x12, 0x90a60140},
4967 .subvendor = 0x1028, 4967 {0x14, 0x90170110},
4968#ifdef CONFIG_SND_DEBUG_VERBOSE 4968 {0x17, 0x40000000},
4969 .name = "Dell", 4969 {0x18, 0x411111f0},
4970#endif 4970 {0x19, 0x411111f0},
4971 .pins = (const struct hda_pintbl[]) { 4971 {0x1a, 0x411111f0},
4972 {0x12, 0x90a60140}, 4972 {0x1b, 0x411111f0},
4973 {0x14, 0x90170110}, 4973 {0x1d, 0x40700001},
4974 {0x17, 0x40000000}, 4974 {0x1e, 0x411111f0},
4975 {0x18, 0x411111f0}, 4975 {0x21, 0x02211020}),
4976 {0x19, 0x411111f0}, 4976 SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
4977 {0x1a, 0x411111f0}, 4977 {0x12, 0x90a60160},
4978 {0x1b, 0x411111f0}, 4978 {0x14, 0x90170120},
4979 {0x1d, 0x40700001}, 4979 {0x17, 0x40000000},
4980 {0x1e, 0x411111f0}, 4980 {0x18, 0x411111f0},
4981 {0x21, 0x02211020}, 4981 {0x19, 0x411111f0},
4982 }, 4982 {0x1a, 0x411111f0},
4983 .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, 4983 {0x1b, 0x411111f0},
4984 }, 4984 {0x1d, 0x40700001},
4985 { 4985 {0x1e, 0x411111f0},
4986 .codec = 0x10ec0255, 4986 {0x21, 0x02211030}),
4987 .subvendor = 0x1028, 4987 SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
4988#ifdef CONFIG_SND_DEBUG_VERBOSE 4988 {0x12, 0x90a60160},
4989 .name = "Dell", 4989 {0x14, 0x90170120},
4990#endif 4990 {0x17, 0x90170140},
4991 .pins = (const struct hda_pintbl[]) { 4991 {0x18, 0x40000000},
4992 {0x12, 0x90a60160}, 4992 {0x19, 0x411111f0},
4993 {0x14, 0x90170120}, 4993 {0x1a, 0x411111f0},
4994 {0x17, 0x40000000}, 4994 {0x1b, 0x411111f0},
4995 {0x18, 0x411111f0}, 4995 {0x1d, 0x41163b05},
4996 {0x19, 0x411111f0}, 4996 {0x1e, 0x411111f0},
4997 {0x1a, 0x411111f0}, 4997 {0x21, 0x0321102f}),
4998 {0x1b, 0x411111f0}, 4998 SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
4999 {0x1d, 0x40700001}, 4999 {0x12, 0x90a60160},
5000 {0x1e, 0x411111f0}, 5000 {0x14, 0x90170130},
5001 {0x21, 0x02211030}, 5001 {0x17, 0x40000000},
5002 }, 5002 {0x18, 0x411111f0},
5003 .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, 5003 {0x19, 0x411111f0},
5004 }, 5004 {0x1a, 0x411111f0},
5005 { 5005 {0x1b, 0x411111f0},
5006 .codec = 0x10ec0255, 5006 {0x1d, 0x40700001},
5007 .subvendor = 0x1028, 5007 {0x1e, 0x411111f0},
5008#ifdef CONFIG_SND_DEBUG_VERBOSE 5008 {0x21, 0x02211040}),
5009 .name = "Dell", 5009 SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5010#endif 5010 {0x12, 0x90a60160},
5011 .pins = (const struct hda_pintbl[]) { 5011 {0x14, 0x90170140},
5012 {0x12, 0x90a60160}, 5012 {0x17, 0x40000000},
5013 {0x14, 0x90170120}, 5013 {0x18, 0x411111f0},
5014 {0x17, 0x90170140}, 5014 {0x19, 0x411111f0},
5015 {0x18, 0x40000000}, 5015 {0x1a, 0x411111f0},
5016 {0x19, 0x411111f0}, 5016 {0x1b, 0x411111f0},
5017 {0x1a, 0x411111f0}, 5017 {0x1d, 0x40700001},
5018 {0x1b, 0x411111f0}, 5018 {0x1e, 0x411111f0},
5019 {0x1d, 0x41163b05}, 5019 {0x21, 0x02211050}),
5020 {0x1e, 0x411111f0}, 5020 SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5021 {0x21, 0x0321102f}, 5021 {0x12, 0x90a60170},
5022 }, 5022 {0x14, 0x90170120},
5023 .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, 5023 {0x17, 0x40000000},
5024 }, 5024 {0x18, 0x411111f0},
5025 { 5025 {0x19, 0x411111f0},
5026 .codec = 0x10ec0255, 5026 {0x1a, 0x411111f0},
5027 .subvendor = 0x1028, 5027 {0x1b, 0x411111f0},
5028#ifdef CONFIG_SND_DEBUG_VERBOSE 5028 {0x1d, 0x40700001},
5029 .name = "Dell", 5029 {0x1e, 0x411111f0},
5030#endif 5030 {0x21, 0x02211030}),
5031 .pins = (const struct hda_pintbl[]) { 5031 SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5032 {0x12, 0x90a60160}, 5032 {0x12, 0x90a60170},
5033 {0x14, 0x90170130}, 5033 {0x14, 0x90170130},
5034 {0x17, 0x40000000}, 5034 {0x17, 0x40000000},
5035 {0x18, 0x411111f0}, 5035 {0x18, 0x411111f0},
5036 {0x19, 0x411111f0}, 5036 {0x19, 0x411111f0},
5037 {0x1a, 0x411111f0}, 5037 {0x1a, 0x411111f0},
5038 {0x1b, 0x411111f0}, 5038 {0x1b, 0x411111f0},
5039 {0x1d, 0x40700001}, 5039 {0x1d, 0x40700001},
5040 {0x1e, 0x411111f0}, 5040 {0x1e, 0x411111f0},
5041 {0x21, 0x02211040}, 5041 {0x21, 0x02211040}),
5042 }, 5042 SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
5043 .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, 5043 {0x12, 0x90a60130},
5044 }, 5044 {0x14, 0x90170110},
5045 { 5045 {0x17, 0x40020008},
5046 .codec = 0x10ec0255, 5046 {0x18, 0x411111f0},
5047 .subvendor = 0x1028, 5047 {0x19, 0x411111f0},
5048#ifdef CONFIG_SND_DEBUG_VERBOSE 5048 {0x1a, 0x411111f0},
5049 .name = "Dell", 5049 {0x1b, 0x411111f0},
5050#endif 5050 {0x1d, 0x40e00001},
5051 .pins = (const struct hda_pintbl[]) { 5051 {0x1e, 0x411111f0},
5052 {0x12, 0x90a60160}, 5052 {0x21, 0x0321101f}),
5053 {0x14, 0x90170140}, 5053 SND_HDA_PIN_QUIRK(0x10ec0283, 0x1028, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
5054 {0x17, 0x40000000}, 5054 {0x12, 0x90a60160},
5055 {0x18, 0x411111f0}, 5055 {0x14, 0x90170120},
5056 {0x19, 0x411111f0}, 5056 {0x17, 0x40000000},
5057 {0x1a, 0x411111f0}, 5057 {0x18, 0x411111f0},
5058 {0x1b, 0x411111f0}, 5058 {0x19, 0x411111f0},
5059 {0x1d, 0x40700001}, 5059 {0x1a, 0x411111f0},
5060 {0x1e, 0x411111f0}, 5060 {0x1b, 0x411111f0},
5061 {0x21, 0x02211050}, 5061 {0x1d, 0x40700001},
5062 }, 5062 {0x1e, 0x411111f0},
5063 .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, 5063 {0x21, 0x02211030}),
5064 }, 5064 SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
5065 { 5065 {0x12, 0x90a60140},
5066 .codec = 0x10ec0255, 5066 {0x13, 0x411111f0},
5067 .subvendor = 0x1028, 5067 {0x14, 0x90170110},
5068#ifdef CONFIG_SND_DEBUG_VERBOSE 5068 {0x15, 0x0221401f},
5069 .name = "Dell", 5069 {0x16, 0x411111f0},
5070#endif 5070 {0x18, 0x411111f0},
5071 .pins = (const struct hda_pintbl[]) { 5071 {0x19, 0x411111f0},
5072 {0x12, 0x90a60170}, 5072 {0x1a, 0x411111f0},
5073 {0x14, 0x90170120}, 5073 {0x1b, 0x411111f0},
5074 {0x17, 0x40000000}, 5074 {0x1d, 0x40700001},
5075 {0x18, 0x411111f0}, 5075 {0x1e, 0x411111f0}),
5076 {0x19, 0x411111f0}, 5076 SND_HDA_PIN_QUIRK(0x10ec0293, 0x1028, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
5077 {0x1a, 0x411111f0}, 5077 {0x12, 0x40000000},
5078 {0x1b, 0x411111f0}, 5078 {0x13, 0x90a60140},
5079 {0x1d, 0x40700001}, 5079 {0x14, 0x90170110},
5080 {0x1e, 0x411111f0}, 5080 {0x15, 0x0221401f},
5081 {0x21, 0x02211030}, 5081 {0x16, 0x21014020},
5082 }, 5082 {0x18, 0x411111f0},
5083 .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, 5083 {0x19, 0x21a19030},
5084 }, 5084 {0x1a, 0x411111f0},
5085 { 5085 {0x1b, 0x411111f0},
5086 .codec = 0x10ec0255, 5086 {0x1d, 0x40700001},
5087 .subvendor = 0x1028, 5087 {0x1e, 0x411111f0}),
5088#ifdef CONFIG_SND_DEBUG_VERBOSE
5089 .name = "Dell",
5090#endif
5091 .pins = (const struct hda_pintbl[]) {
5092 {0x12, 0x90a60170},
5093 {0x14, 0x90170130},
5094 {0x17, 0x40000000},
5095 {0x18, 0x411111f0},
5096 {0x19, 0x411111f0},
5097 {0x1a, 0x411111f0},
5098 {0x1b, 0x411111f0},
5099 {0x1d, 0x40700001},
5100 {0x1e, 0x411111f0},
5101 {0x21, 0x02211040},
5102 },
5103 .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
5104 },
5105 {
5106 .codec = 0x10ec0283,
5107 .subvendor = 0x1028,
5108#ifdef CONFIG_SND_DEBUG_VERBOSE
5109 .name = "Dell",
5110#endif
5111 .pins = (const struct hda_pintbl[]) {
5112 {0x12, 0x90a60130},
5113 {0x14, 0x90170110},
5114 {0x17, 0x40020008},
5115 {0x18, 0x411111f0},
5116 {0x19, 0x411111f0},
5117 {0x1a, 0x411111f0},
5118 {0x1b, 0x411111f0},
5119 {0x1d, 0x40e00001},
5120 {0x1e, 0x411111f0},
5121 {0x21, 0x0321101f},
5122 },
5123 .value = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
5124 },
5125 {
5126 .codec = 0x10ec0283,
5127 .subvendor = 0x1028,
5128#ifdef CONFIG_SND_DEBUG_VERBOSE
5129 .name = "Dell",
5130#endif
5131 .pins = (const struct hda_pintbl[]) {
5132 {0x12, 0x90a60160},
5133 {0x14, 0x90170120},
5134 {0x17, 0x40000000},
5135 {0x18, 0x411111f0},
5136 {0x19, 0x411111f0},
5137 {0x1a, 0x411111f0},
5138 {0x1b, 0x411111f0},
5139 {0x1d, 0x40700001},
5140 {0x1e, 0x411111f0},
5141 {0x21, 0x02211030},
5142 },
5143 .value = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
5144 },
5145 {
5146 .codec = 0x10ec0292,
5147 .subvendor = 0x1028,
5148#ifdef CONFIG_SND_DEBUG_VERBOSE
5149 .name = "Dell",
5150#endif
5151 .pins = (const struct hda_pintbl[]) {
5152 {0x12, 0x90a60140},
5153 {0x13, 0x411111f0},
5154 {0x14, 0x90170110},
5155 {0x15, 0x0221401f},
5156 {0x16, 0x411111f0},
5157 {0x18, 0x411111f0},
5158 {0x19, 0x411111f0},
5159 {0x1a, 0x411111f0},
5160 {0x1b, 0x411111f0},
5161 {0x1d, 0x40700001},
5162 {0x1e, 0x411111f0},
5163 },
5164 .value = ALC269_FIXUP_DELL3_MIC_NO_PRESENCE,
5165 },
5166 {
5167 .codec = 0x10ec0293,
5168 .subvendor = 0x1028,
5169#ifdef CONFIG_SND_DEBUG_VERBOSE
5170 .name = "Dell",
5171#endif
5172 .pins = (const struct hda_pintbl[]) {
5173 {0x12, 0x40000000},
5174 {0x13, 0x90a60140},
5175 {0x14, 0x90170110},
5176 {0x15, 0x0221401f},
5177 {0x16, 0x21014020},
5178 {0x18, 0x411111f0},
5179 {0x19, 0x21a19030},
5180 {0x1a, 0x411111f0},
5181 {0x1b, 0x411111f0},
5182 {0x1d, 0x40700001},
5183 {0x1e, 0x411111f0},
5184 },
5185 .value = ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
5186 },
5187 {} 5088 {}
5188}; 5089};
5189 5090
@@ -6039,111 +5940,66 @@ static const struct hda_model_fixup alc662_fixup_models[] = {
6039}; 5940};
6040 5941
6041static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = { 5942static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {
6042 { 5943 SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
6043 .codec = 0x10ec0668, 5944 {0x12, 0x99a30130},
6044 .subvendor = 0x1028, 5945 {0x14, 0x90170110},
6045#ifdef CONFIG_SND_DEBUG_VERBOSE 5946 {0x15, 0x0321101f},
6046 .name = "Dell", 5947 {0x16, 0x03011020},
6047#endif 5948 {0x18, 0x40000008},
6048 .pins = (const struct hda_pintbl[]) { 5949 {0x19, 0x411111f0},
6049 {0x12, 0x99a30130}, 5950 {0x1a, 0x411111f0},
6050 {0x14, 0x90170110}, 5951 {0x1b, 0x411111f0},
6051 {0x15, 0x0321101f}, 5952 {0x1d, 0x41000001},
6052 {0x16, 0x03011020}, 5953 {0x1e, 0x411111f0},
6053 {0x18, 0x40000008}, 5954 {0x1f, 0x411111f0}),
6054 {0x19, 0x411111f0}, 5955 SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
6055 {0x1a, 0x411111f0}, 5956 {0x12, 0x99a30140},
6056 {0x1b, 0x411111f0}, 5957 {0x14, 0x90170110},
6057 {0x1d, 0x41000001}, 5958 {0x15, 0x0321101f},
6058 {0x1e, 0x411111f0}, 5959 {0x16, 0x03011020},
6059 {0x1f, 0x411111f0}, 5960 {0x18, 0x40000008},
6060 }, 5961 {0x19, 0x411111f0},
6061 .value = ALC668_FIXUP_AUTO_MUTE, 5962 {0x1a, 0x411111f0},
6062 }, 5963 {0x1b, 0x411111f0},
6063 { 5964 {0x1d, 0x41000001},
6064 .codec = 0x10ec0668, 5965 {0x1e, 0x411111f0},
6065 .subvendor = 0x1028, 5966 {0x1f, 0x411111f0}),
6066#ifdef CONFIG_SND_DEBUG_VERBOSE 5967 SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
6067 .name = "Dell", 5968 {0x12, 0x99a30150},
6068#endif 5969 {0x14, 0x90170110},
6069 .pins = (const struct hda_pintbl[]) { 5970 {0x15, 0x0321101f},
6070 {0x12, 0x99a30140}, 5971 {0x16, 0x03011020},
6071 {0x14, 0x90170110}, 5972 {0x18, 0x40000008},
6072 {0x15, 0x0321101f}, 5973 {0x19, 0x411111f0},
6073 {0x16, 0x03011020}, 5974 {0x1a, 0x411111f0},
6074 {0x18, 0x40000008}, 5975 {0x1b, 0x411111f0},
6075 {0x19, 0x411111f0}, 5976 {0x1d, 0x41000001},
6076 {0x1a, 0x411111f0}, 5977 {0x1e, 0x411111f0},
6077 {0x1b, 0x411111f0}, 5978 {0x1f, 0x411111f0}),
6078 {0x1d, 0x41000001}, 5979 SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,
6079 {0x1e, 0x411111f0}, 5980 {0x12, 0x411111f0},
6080 {0x1f, 0x411111f0}, 5981 {0x14, 0x90170110},
6081 }, 5982 {0x15, 0x0321101f},
6082 .value = ALC668_FIXUP_AUTO_MUTE, 5983 {0x16, 0x03011020},
6083 }, 5984 {0x18, 0x40000008},
6084 { 5985 {0x19, 0x411111f0},
6085 .codec = 0x10ec0668, 5986 {0x1a, 0x411111f0},
6086 .subvendor = 0x1028, 5987 {0x1b, 0x411111f0},
6087#ifdef CONFIG_SND_DEBUG_VERBOSE 5988 {0x1d, 0x41000001},
6088 .name = "Dell", 5989 {0x1e, 0x411111f0},
6089#endif 5990 {0x1f, 0x411111f0}),
6090 .pins = (const struct hda_pintbl[]) { 5991 SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell XPS 15", ALC668_FIXUP_AUTO_MUTE,
6091 {0x12, 0x99a30150}, 5992 {0x12, 0x90a60130},
6092 {0x14, 0x90170110}, 5993 {0x14, 0x90170110},
6093 {0x15, 0x0321101f}, 5994 {0x15, 0x0321101f},
6094 {0x16, 0x03011020}, 5995 {0x16, 0x40000000},
6095 {0x18, 0x40000008}, 5996 {0x18, 0x411111f0},
6096 {0x19, 0x411111f0}, 5997 {0x19, 0x411111f0},
6097 {0x1a, 0x411111f0}, 5998 {0x1a, 0x411111f0},
6098 {0x1b, 0x411111f0}, 5999 {0x1b, 0x411111f0},
6099 {0x1d, 0x41000001}, 6000 {0x1d, 0x40d6832d},
6100 {0x1e, 0x411111f0}, 6001 {0x1e, 0x411111f0},
6101 {0x1f, 0x411111f0}, 6002 {0x1f, 0x411111f0}),
6102 },
6103 .value = ALC668_FIXUP_AUTO_MUTE,
6104 },
6105 {
6106 .codec = 0x10ec0668,
6107 .subvendor = 0x1028,
6108#ifdef CONFIG_SND_DEBUG_VERBOSE
6109 .name = "Dell",
6110#endif
6111 .pins = (const struct hda_pintbl[]) {
6112 {0x12, 0x411111f0},
6113 {0x14, 0x90170110},
6114 {0x15, 0x0321101f},
6115 {0x16, 0x03011020},
6116 {0x18, 0x40000008},
6117 {0x19, 0x411111f0},
6118 {0x1a, 0x411111f0},
6119 {0x1b, 0x411111f0},
6120 {0x1d, 0x41000001},
6121 {0x1e, 0x411111f0},
6122 {0x1f, 0x411111f0},
6123 },
6124 .value = ALC668_FIXUP_AUTO_MUTE,
6125 },
6126 {
6127 .codec = 0x10ec0668,
6128 .subvendor = 0x1028,
6129#ifdef CONFIG_SND_DEBUG_VERBOSE
6130 .name = "Dell XPS 15",
6131#endif
6132 .pins = (const struct hda_pintbl[]) {
6133 {0x12, 0x90a60130},
6134 {0x14, 0x90170110},
6135 {0x15, 0x0321101f},
6136 {0x16, 0x40000000},
6137 {0x18, 0x411111f0},
6138 {0x19, 0x411111f0},
6139 {0x1a, 0x411111f0},
6140 {0x1b, 0x411111f0},
6141 {0x1d, 0x40d6832d},
6142 {0x1e, 0x411111f0},
6143 {0x1f, 0x411111f0},
6144 },
6145 .value = ALC668_FIXUP_AUTO_MUTE,
6146 },
6147 {} 6003 {}
6148}; 6004};
6149 6005
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-24 12:29:50 -0400