Commit e95806df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This contains a few HD-audio device-specific quirks and an endianess
  fix for USB-audio, as well as the update of quirk model list document.
  All fixes are small and trivial.

  The document update could have been postponed, but it's a good thing
  for user and has absolutely zero risk of breakage, so included here"

* tag 'sound-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430
  ALSA: hda - Update the list of quirk models
  ALSA: hda - Provide dual-codecs model option for a few Realtek codecs
  ALSA: hda - Apply dual-codec quirk for MSI Z270-Gaming mobo
  ALSA: hda - No loopback on ALC299 codec
  ALSA: usb-audio: fix Amanero Combo384 quirk on big-endian hosts
parents 876ca8f3 1fc2e41f

Documentation/sound/hd-audio/models.rst

+65 −49
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ ALC880 
    6-jack in back, 2-jack in front

6stack-digout

    6-jack with a SPDIF out

6stack-automute

    6-jack with headphone jack detection



ALC260

======
@@ -62,6 +64,8 @@ lenovo-dock 
    Enables docking station I/O for some Lenovos

hp-gpio-led

    GPIO LED support on HP laptops

hp-dock-gpio-mic1-led

    HP dock with mic LED support

dell-headset-multi

    Headset jack, which can also be used as mic-in

dell-headset-dock
@@ -72,6 +76,12 @@ alc283-sense-combo 
    Combo jack sensing on ALC283

tpt440-dock

    Pin configs for Lenovo Thinkpad Dock support

tpt440

    Lenovo Thinkpad T440s setup

tpt460

    Lenovo Thinkpad T460/560 setup

dual-codecs

    Lenovo laptops with dual codecs



ALC66x/67x/892

==============
@@ -97,6 +107,8 @@ inv-dmic 
    Inverted internal mic workaround

dell-headset-multi

    Headset jack, which can also be used as mic-in

dual-codecs

    Lenovo laptops with dual codecs



ALC680

======
@@ -114,6 +126,8 @@ inv-dmic 
    Inverted internal mic workaround

no-primary-hp

    VAIO Z/VGC-LN51JGB workaround (for fixed speaker DAC)

dual-codecs

    ALC1220 dual codecs for Gaming mobos



ALC861/660

==========
@@ -206,65 +220,47 @@ auto 


Conexant 5045

=============

laptop-hpsense

    Laptop with HP sense (old model laptop)

laptop-micsense

    Laptop with Mic sense (old model fujitsu)

laptop-hpmicsense

    Laptop with HP and Mic senses

benq

    Benq R55E

laptop-hp530

    HP 530 laptop

test

    for testing/debugging purpose, almost all controls can be

    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y

cap-mix-amp

    Fix max input level on mixer widget

toshiba-p105

    Toshiba P105 quirk

hp-530

    HP 530 quirk



Conexant 5047

=============

laptop

    Basic Laptop config 

laptop-hp

    Laptop config for some HP models (subdevice 30A5)

laptop-eapd

    Laptop config with EAPD support

test

    for testing/debugging purpose, almost all controls can be

    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y

cap-mix-amp

    Fix max input level on mixer widget



Conexant 5051

=============

laptop

    Basic Laptop config (default)

hp

    HP Spartan laptop

hp-dv6736

    HP dv6736

hp-f700

    HP Compaq Presario F700

ideapad

    Lenovo IdeaPad laptop

toshiba

    Toshiba Satellite M300

lenovo-x200

    Lenovo X200 quirk



Conexant 5066

=============

laptop

    Basic Laptop config (default)

hp-laptop

    HP laptops, e g G60

asus

    Asus K52JU, Lenovo G560

dell-laptop

    Dell laptops

dell-vostro

    Dell Vostro

olpc-xo-1_5

    OLPC XO 1.5

ideapad

    Lenovo IdeaPad U150

stereo-dmic

    Workaround for inverted stereo digital mic

gpio1

    Enable GPIO1 pin

headphone-mic-pin

    Enable headphone mic NID 0x18 without detection

tp410

    Thinkpad T400 & co quirks

thinkpad

    Lenovo Thinkpad

    Thinkpad mute/mic LED quirk

lemote-a1004

    Lemote A1004 quirk

lemote-a1205

    Lemote A1205 quirk

olpc-xo

    OLPC XO quirk

mute-led-eapd

    Mute LED control via EAPD

hp-dock

    HP dock support

mute-led-gpio

    Mute LED control via GPIO



STAC9200

========
@@ -444,6 +440,8 @@ dell-eq 
    Dell desktops/laptops

alienware

    Alienware M17x

asus-mobo

    Pin configs for ASUS mobo with 5.1/SPDIF out

auto

    BIOS setup (default)
@@ -477,6 +475,8 @@ hp-envy-ts-bass 
    Pin fixup for HP Envy TS bass speaker (NID 0x10)

hp-bnb13-eq

    Hardware equalizer setup for HP laptops

hp-envy-ts-bass

    HP Envy TS bass support

auto

    BIOS setup (default)
@@ -496,10 +496,22 @@ auto 


Cirrus Logic CS4206/4207

========================

mbp53

    MacBook Pro 5,3

mbp55

    MacBook Pro 5,5

imac27

    IMac 27 Inch

imac27_122

    iMac 12,2

apple

    Generic Apple quirk

mbp101

    MacBookPro 10,1

mbp81

    MacBookPro 8,1

mba42

    MacBookAir 4,2

auto

    BIOS setup (default)
@@ -509,6 +521,10 @@ mba6 
    MacBook Air 6,1 and 6,2

gpio0

    Enable GPIO 0 amp

mbp11

    MacBookPro 11,2

macmini

    MacMini 7,1

auto

    BIOS setup (default)

sound/pci/hda/patch_realtek.c

+7 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3),

	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),

	SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),

	SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),

	SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX),

	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),

	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),
@@ -2342,6 +2343,7 @@ static const struct hda_model_fixup alc882_fixup_models[] = { 
	{.id = ALC883_FIXUP_ACER_EAPD, .name = "acer-aspire"},

	{.id = ALC882_FIXUP_INV_DMIC, .name = "inv-dmic"},

	{.id = ALC882_FIXUP_NO_PRIMARY_HP, .name = "no-primary-hp"},

	{.id = ALC1220_FIXUP_GB_DUAL_CODECS, .name = "dual-codecs"},

	{}

};
@@ -6014,6 +6016,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},

	{.id = ALC292_FIXUP_TPT440, .name = "tpt440"},

	{.id = ALC292_FIXUP_TPT460, .name = "tpt460"},

	{.id = ALC233_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},

	{}

};

#define ALC225_STANDARD_PINS \
@@ -6465,8 +6468,11 @@ static int patch_alc269(struct hda_codec *codec) 
		break;

	case 0x10ec0225:

	case 0x10ec0295:

		spec->codec_variant = ALC269_TYPE_ALC225;

		break;

	case 0x10ec0299:

		spec->codec_variant = ALC269_TYPE_ALC225;

		spec->gen.mixer_nid = 0; /* no loopback on ALC299 */

		break;

	case 0x10ec0234:

	case 0x10ec0274:
@@ -7338,6 +7344,7 @@ static const struct hda_model_fixup alc662_fixup_models[] = { 
	{.id = ALC662_FIXUP_ASUS_MODE8, .name = "asus-mode8"},

	{.id = ALC662_FIXUP_INV_DMIC, .name = "inv-dmic"},

	{.id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE, .name = "dell-headset-multi"},

	{.id = ALC662_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"},

	{}

};

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Diff line number Diff line
@@ -1559,6 +1559,8 @@ static const struct snd_pci_quirk stac9200_fixup_tbl[] = { 
		      "Dell Inspiron 1501", STAC_9200_DELL_M26),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f6,

		      "unknown Dell", STAC_9200_DELL_M26),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0201,

		      "Dell Latitude D430", STAC_9200_DELL_M22),

	/* Panasonic */

	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-74", STAC_9200_PANASONIC),

	/* Gateway machines needs EAPD to be set on resume */

sound/usb/quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, 
	/* Amanero Combo384 USB interface with native DSD support */

	case USB_ID(0x16d0, 0x071a):

		if (fp->altsetting == 2) {

			switch (chip->dev->descriptor.bcdDevice) {

			switch (le16_to_cpu(chip->dev->descriptor.bcdDevice)) {

			case 0x199:

				return SNDRV_PCM_FMTBIT_DSD_U32_LE;

			case 0x19b:

CRA Git | Maintained and supported by SUSTech CRA and CCSE