aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHui Wang <hui.wang@canonical.com>2014-09-02 23:31:09 -0400
committerTakashi Iwai <tiwai@suse.de>2014-09-03 01:34:57 -0400
commite4442bcf1aa166a2b132ea9fde47036744a7f8a3 (patch)
treeec64bc39c1ab7b47460393564978f4c399d515cf
parent2c609999759c6964d99a614e8259fa700b5b337c (diff)
ALSA: hda/realtek - move HP_MUTE_LED_MIC1 quirk for alc290
Cc: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c104
1 files changed, 91 insertions, 13 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0bba21708904..edb0fe1b8f1b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4850,7 +4850,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
4850 SND_PCI_QUIRK(0x103c, 0x226b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4850 SND_PCI_QUIRK(0x103c, 0x226b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4851 SND_PCI_QUIRK(0x103c, 0x226e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4851 SND_PCI_QUIRK(0x103c, 0x226e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4852 SND_PCI_QUIRK(0x103c, 0x229e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4852 SND_PCI_QUIRK(0x103c, 0x229e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4853 SND_PCI_QUIRK(0x103c, 0x22a0, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4854 SND_PCI_QUIRK(0x103c, 0x22b2, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4853 SND_PCI_QUIRK(0x103c, 0x22b2, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4855 SND_PCI_QUIRK(0x103c, 0x22b7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4854 SND_PCI_QUIRK(0x103c, 0x22b7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4856 SND_PCI_QUIRK(0x103c, 0x22bf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4855 SND_PCI_QUIRK(0x103c, 0x22bf, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
@@ -4883,8 +4882,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
4883 SND_PCI_QUIRK(0x103c, 0x2259, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), 4882 SND_PCI_QUIRK(0x103c, 0x2259, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4884 SND_PCI_QUIRK(0x103c, 0x225a, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), 4883 SND_PCI_QUIRK(0x103c, 0x225a, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4885 SND_PCI_QUIRK(0x103c, 0x2260, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4884 SND_PCI_QUIRK(0x103c, 0x2260, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4886 SND_PCI_QUIRK(0x103c, 0x2261, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4887 SND_PCI_QUIRK(0x103c, 0x2262, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4888 SND_PCI_QUIRK(0x103c, 0x2263, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4885 SND_PCI_QUIRK(0x103c, 0x2263, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4889 SND_PCI_QUIRK(0x103c, 0x2264, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4886 SND_PCI_QUIRK(0x103c, 0x2264, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4890 SND_PCI_QUIRK(0x103c, 0x2265, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4887 SND_PCI_QUIRK(0x103c, 0x2265, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
@@ -4892,23 +4889,13 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
4892 SND_PCI_QUIRK(0x103c, 0x2273, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), 4889 SND_PCI_QUIRK(0x103c, 0x2273, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4893 SND_PCI_QUIRK(0x103c, 0x2277, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), 4890 SND_PCI_QUIRK(0x103c, 0x2277, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4894 SND_PCI_QUIRK(0x103c, 0x2278, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED), 4891 SND_PCI_QUIRK(0x103c, 0x2278, "HP", ALC269_FIXUP_HP_GPIO_MIC1_LED),
4895 SND_PCI_QUIRK(0x103c, 0x227d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4896 SND_PCI_QUIRK(0x103c, 0x227e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4897 SND_PCI_QUIRK(0x103c, 0x227f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4892 SND_PCI_QUIRK(0x103c, 0x227f, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4898 SND_PCI_QUIRK(0x103c, 0x2280, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4899 SND_PCI_QUIRK(0x103c, 0x2281, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4900 SND_PCI_QUIRK(0x103c, 0x2282, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4893 SND_PCI_QUIRK(0x103c, 0x2282, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4901 SND_PCI_QUIRK(0x103c, 0x2289, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4902 SND_PCI_QUIRK(0x103c, 0x228a, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4903 SND_PCI_QUIRK(0x103c, 0x228b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4894 SND_PCI_QUIRK(0x103c, 0x228b, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4904 SND_PCI_QUIRK(0x103c, 0x228c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4905 SND_PCI_QUIRK(0x103c, 0x228d, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4906 SND_PCI_QUIRK(0x103c, 0x228e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4895 SND_PCI_QUIRK(0x103c, 0x228e, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4907 SND_PCI_QUIRK(0x103c, 0x22c5, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4896 SND_PCI_QUIRK(0x103c, 0x22c5, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4908 SND_PCI_QUIRK(0x103c, 0x22c6, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4909 SND_PCI_QUIRK(0x103c, 0x22c7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4897 SND_PCI_QUIRK(0x103c, 0x22c7, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4910 SND_PCI_QUIRK(0x103c, 0x22c8, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4898 SND_PCI_QUIRK(0x103c, 0x22c8, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4911 SND_PCI_QUIRK(0x103c, 0x22c3, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4912 SND_PCI_QUIRK(0x103c, 0x22c4, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4899 SND_PCI_QUIRK(0x103c, 0x22c4, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4913 SND_PCI_QUIRK(0x103c, 0x2334, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4900 SND_PCI_QUIRK(0x103c, 0x2334, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
4914 SND_PCI_QUIRK(0x103c, 0x2335, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1), 4901 SND_PCI_QUIRK(0x103c, 0x2335, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
@@ -5227,6 +5214,97 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
5227 {0x1d, 0x40e00001}, 5214 {0x1d, 0x40e00001},
5228 {0x1e, 0x411111f0}, 5215 {0x1e, 0x411111f0},
5229 {0x21, 0x0321101f}), 5216 {0x21, 0x0321101f}),
5217 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
5218 {0x12, 0x99a30130},
5219 {0x13, 0x40000000},
5220 {0x14, 0x411111f0},
5221 {0x15, 0x04211040},
5222 {0x16, 0x411111f0},
5223 {0x17, 0x411111f0},
5224 {0x18, 0x90170112},
5225 {0x19, 0x411111f0},
5226 {0x1a, 0x04a11020},
5227 {0x1b, 0x411111f0},
5228 {0x1d, 0x4075812d},
5229 {0x1e, 0x411111f0}),
5230 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
5231 {0x12, 0x99a30130},
5232 {0x13, 0x40000000},
5233 {0x14, 0x411111f0},
5234 {0x15, 0x04211040},
5235 {0x16, 0x411111f0},
5236 {0x17, 0x411111f0},
5237 {0x18, 0x90170110},
5238 {0x19, 0x411111f0},
5239 {0x1a, 0x04a11020},
5240 {0x1b, 0x411111f0},
5241 {0x1d, 0x4075812d},
5242 {0x1e, 0x411111f0}),
5243 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
5244 {0x12, 0x99a30130},
5245 {0x13, 0x40000000},
5246 {0x14, 0x411111f0},
5247 {0x15, 0x0421101f},
5248 {0x16, 0x411111f0},
5249 {0x17, 0x411111f0},
5250 {0x18, 0x411111f0},
5251 {0x19, 0x411111f0},
5252 {0x1a, 0x04a11020},
5253 {0x1b, 0x411111f0},
5254 {0x1d, 0x4075812d},
5255 {0x1e, 0x411111f0}),
5256 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
5257 {0x12, 0x99a30130},
5258 {0x13, 0x40000000},
5259 {0x14, 0x411111f0},
5260 {0x15, 0x04211020},
5261 {0x16, 0x411111f0},
5262 {0x17, 0x411111f0},
5263 {0x18, 0x411111f0},
5264 {0x19, 0x411111f0},
5265 {0x1a, 0x04a11040},
5266 {0x1b, 0x411111f0},
5267 {0x1d, 0x4076a12d},
5268 {0x1e, 0x411111f0}),
5269 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
5270 {0x12, 0x99a30130},
5271 {0x13, 0x40000000},
5272 {0x14, 0x90170110},
5273 {0x15, 0x04211020},
5274 {0x16, 0x411111f0},
5275 {0x17, 0x411111f0},
5276 {0x18, 0x411111f0},
5277 {0x19, 0x411111f0},
5278 {0x1a, 0x04a11040},
5279 {0x1b, 0x411111f0},
5280 {0x1d, 0x4076a12d},
5281 {0x1e, 0x411111f0}),
5282 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
5283 {0x12, 0x99a30130},
5284 {0x13, 0x40000000},
5285 {0x14, 0x90170110},
5286 {0x15, 0x04211020},
5287 {0x16, 0x411111f0},
5288 {0x17, 0x411111f0},
5289 {0x18, 0x411111f0},
5290 {0x19, 0x411111f0},
5291 {0x1a, 0x04a11020},
5292 {0x1b, 0x411111f0},
5293 {0x1d, 0x4076a12d},
5294 {0x1e, 0x411111f0}),
5295 SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1,
5296 {0x12, 0x99a30130},
5297 {0x13, 0x40000000},
5298 {0x14, 0x90170110},
5299 {0x15, 0x0421101f},
5300 {0x16, 0x411111f0},
5301 {0x17, 0x411111f0},
5302 {0x18, 0x411111f0},
5303 {0x19, 0x411111f0},
5304 {0x1a, 0x04a11020},
5305 {0x1b, 0x411111f0},
5306 {0x1d, 0x4075812d},
5307 {0x1e, 0x411111f0}),
5230 SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, 5308 SND_HDA_PIN_QUIRK(0x10ec0292, 0x1028, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,
5231 {0x12, 0x90a60140}, 5309 {0x12, 0x90a60140},
5232 {0x13, 0x411111f0}, 5310 {0x13, 0x411111f0},