Merge tag 'sound-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

+65 -49

Documentation/sound/hd-audio/models.rst

··· 16 16 6-jack in back, 2-jack in front 17 17 6stack-digout 18 18 6-jack with a SPDIF out 19 + 6stack-automute 20 + 6-jack with headphone jack detection 19 21 20 22 ALC260 21 23 ====== ··· 64 62 Enables docking station I/O for some Lenovos 65 63 hp-gpio-led 66 64 GPIO LED support on HP laptops 65 + hp-dock-gpio-mic1-led 66 + HP dock with mic LED support 67 67 dell-headset-multi 68 68 Headset jack, which can also be used as mic-in 69 69 dell-headset-dock ··· 76 72 Combo jack sensing on ALC283 77 73 tpt440-dock 78 74 Pin configs for Lenovo Thinkpad Dock support 75 + tpt440 76 + Lenovo Thinkpad T440s setup 77 + tpt460 78 + Lenovo Thinkpad T460/560 setup 79 + dual-codecs 80 + Lenovo laptops with dual codecs 79 81 80 82 ALC66x/67x/892 81 83 ============== ··· 107 97 Inverted internal mic workaround 108 98 dell-headset-multi 109 99 Headset jack, which can also be used as mic-in 100 + dual-codecs 101 + Lenovo laptops with dual codecs 110 102 111 103 ALC680 112 104 ====== ··· 126 114 Inverted internal mic workaround 127 115 no-primary-hp 128 116 VAIO Z/VGC-LN51JGB workaround (for fixed speaker DAC) 117 + dual-codecs 118 + ALC1220 dual codecs for Gaming mobos 129 119 130 120 ALC861/660 131 121 ========== ··· 220 206 221 207 Conexant 5045 222 208 ============= 223 - laptop-hpsense 224 - Laptop with HP sense (old model laptop) 225 - laptop-micsense 226 - Laptop with Mic sense (old model fujitsu) 227 - laptop-hpmicsense 228 - Laptop with HP and Mic senses 229 - benq 230 - Benq R55E 231 - laptop-hp530 232 - HP 530 laptop 233 - test 234 - for testing/debugging purpose, almost all controls can be 235 - adjusted. Appearing only when compiled with $CONFIG_SND_DEBUG=y 209 + cap-mix-amp 210 + Fix max input level on mixer widget 211 + toshiba-p105 212 + Toshiba P105 quirk 213 + hp-530 214 + HP 530 quirk 236 215 237 216 Conexant 5047 238 217 ============= 239 - laptop 240 - Basic Laptop config 241 - laptop-hp 242 - Laptop config for some HP models (subdevice 30A5) 243 - laptop-eapd 244 - Laptop config with EAPD support 245 - test 246 - for testing/debugging purpose, almost all controls can be 247 - adjusted. Appearing only when compiled with $CONFIG_SND_DEBUG=y 218 + cap-mix-amp 219 + Fix max input level on mixer widget 248 220 249 221 Conexant 5051 250 222 ============= 251 - laptop 252 - Basic Laptop config (default) 253 - hp 254 - HP Spartan laptop 255 - hp-dv6736 256 - HP dv6736 257 - hp-f700 258 - HP Compaq Presario F700 259 - ideapad 260 - Lenovo IdeaPad laptop 261 - toshiba 262 - Toshiba Satellite M300 223 + lenovo-x200 224 + Lenovo X200 quirk 263 225 264 226 Conexant 5066 265 227 ============= 266 - laptop 267 - Basic Laptop config (default) 268 - hp-laptop 269 - HP laptops, e g G60 270 - asus 271 - Asus K52JU, Lenovo G560 272 - dell-laptop 273 - Dell laptops 274 - dell-vostro 275 - Dell Vostro 276 - olpc-xo-1_5 277 - OLPC XO 1.5 278 - ideapad 279 - Lenovo IdeaPad U150 228 + stereo-dmic 229 + Workaround for inverted stereo digital mic 230 + gpio1 231 + Enable GPIO1 pin 232 + headphone-mic-pin 233 + Enable headphone mic NID 0x18 without detection 234 + tp410 235 + Thinkpad T400 & co quirks 280 236 thinkpad 281 - Lenovo Thinkpad 237 + Thinkpad mute/mic LED quirk 238 + lemote-a1004 239 + Lemote A1004 quirk 240 + lemote-a1205 241 + Lemote A1205 quirk 242 + olpc-xo 243 + OLPC XO quirk 244 + mute-led-eapd 245 + Mute LED control via EAPD 246 + hp-dock 247 + HP dock support 248 + mute-led-gpio 249 + Mute LED control via GPIO 282 250 283 251 STAC9200 284 252 ======== ··· 440 444 Dell desktops/laptops 441 445 alienware 442 446 Alienware M17x 447 + asus-mobo 448 + Pin configs for ASUS mobo with 5.1/SPDIF out 443 449 auto 444 450 BIOS setup (default) 445 451 ··· 475 477 Pin fixup for HP Envy TS bass speaker (NID 0x10) 476 478 hp-bnb13-eq 477 479 Hardware equalizer setup for HP laptops 480 + hp-envy-ts-bass 481 + HP Envy TS bass support 478 482 auto 479 483 BIOS setup (default) 480 484 ··· 496 496 497 497 Cirrus Logic CS4206/4207 498 498 ======================== 499 + mbp53 500 + MacBook Pro 5,3 499 501 mbp55 500 502 MacBook Pro 5,5 501 503 imac27 502 504 IMac 27 Inch 505 + imac27_122 506 + iMac 12,2 507 + apple 508 + Generic Apple quirk 509 + mbp101 510 + MacBookPro 10,1 511 + mbp81 512 + MacBookPro 8,1 513 + mba42 514 + MacBookAir 4,2 503 515 auto 504 516 BIOS setup (default) 505 517 ··· 521 509 MacBook Air 6,1 and 6,2 522 510 gpio0 523 511 Enable GPIO 0 amp 512 + mbp11 513 + MacBookPro 11,2 514 + macmini 515 + MacMini 7,1 524 516 auto 525 517 BIOS setup (default) 526 518

+7

sound/pci/hda/patch_realtek.c

··· 2328 2328 SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3), 2329 2329 SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE), 2330 2330 SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), 2331 + SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), 2331 2332 SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX), 2332 2333 SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD), 2333 2334 SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD), ··· 2343 2342 {.id = ALC883_FIXUP_ACER_EAPD, .name = "acer-aspire"}, 2344 2343 {.id = ALC882_FIXUP_INV_DMIC, .name = "inv-dmic"}, 2345 2344 {.id = ALC882_FIXUP_NO_PRIMARY_HP, .name = "no-primary-hp"}, 2345 + {.id = ALC1220_FIXUP_GB_DUAL_CODECS, .name = "dual-codecs"}, 2346 2346 {} 2347 2347 }; 2348 2348 ··· 6016 6014 {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"}, 6017 6015 {.id = ALC292_FIXUP_TPT440, .name = "tpt440"}, 6018 6016 {.id = ALC292_FIXUP_TPT460, .name = "tpt460"}, 6017 + {.id = ALC233_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"}, 6019 6018 {} 6020 6019 }; 6021 6020 #define ALC225_STANDARD_PINS \ ··· 6468 6465 break; 6469 6466 case 0x10ec0225: 6470 6467 case 0x10ec0295: 6468 + spec->codec_variant = ALC269_TYPE_ALC225; 6469 + break; 6471 6470 case 0x10ec0299: 6472 6471 spec->codec_variant = ALC269_TYPE_ALC225; 6472 + spec->gen.mixer_nid = 0; /* no loopback on ALC299 */ 6473 6473 break; 6474 6474 case 0x10ec0234: 6475 6475 case 0x10ec0274: ··· 7344 7338 {.id = ALC662_FIXUP_ASUS_MODE8, .name = "asus-mode8"}, 7345 7339 {.id = ALC662_FIXUP_INV_DMIC, .name = "inv-dmic"}, 7346 7340 {.id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE, .name = "dell-headset-multi"}, 7341 + {.id = ALC662_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"}, 7347 7342 {} 7348 7343 }; 7349 7344

+2

sound/pci/hda/patch_sigmatel.c

··· 1559 1559 "Dell Inspiron 1501", STAC_9200_DELL_M26), 1560 1560 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f6, 1561 1561 "unknown Dell", STAC_9200_DELL_M26), 1562 + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0201, 1563 + "Dell Latitude D430", STAC_9200_DELL_M22), 1562 1564 /* Panasonic */ 1563 1565 SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-74", STAC_9200_PANASONIC), 1564 1566 /* Gateway machines needs EAPD to be set on resume */

+1 -1

sound/usb/quirks.c

··· 1364 1364 /* Amanero Combo384 USB interface with native DSD support */ 1365 1365 case USB_ID(0x16d0, 0x071a): 1366 1366 if (fp->altsetting == 2) { 1367 - switch (chip->dev->descriptor.bcdDevice) { 1367 + switch (le16_to_cpu(chip->dev->descriptor.bcdDevice)) { 1368 1368 case 0x199: 1369 1369 return SNDRV_PCM_FMTBIT_DSD_U32_LE; 1370 1370 case 0x19b:

Configure Feed

Configure Feed