sound fixes for 4.6
Linus,
please pull sound fixes for v4.6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.6
The topmost commit is 84add303ef950b8d85f54bc2248c2bc73467c329
----------------------------------------------------------------
sound fixes for 4.6
This is a pretty boring pull request as you wish: including a few small and trivial HD-audio and USB-audio quirks and a couple of small regression fixes in HD-audio.
----------------------------------------------------------------
Kaho Ng (1):
ALSA: hda - Fix white noise on Asus UX501VW headset
Takashi Iwai (4):
ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2)
ALSA: hda - Fix broken reconfig
ALSA: hda - Fix regression on ATI HDMI audio
ALSA: usb-audio: Yet another Phoneix Audio device quirk
Yura Pakhuchiy (1):
ALSA: hda - Fix subwoofer pin on ASUS N751 and N551
--- sound/pci/hda/hda_sysfs.c | 8 -------- sound/pci/hda/patch_hdmi.c | 7 +++---- sound/pci/hda/patch_realtek.c | 13 +++++++++++++ sound/usb/quirks.c | 3 +++ 4 files changed, 19 insertions(+), 12 deletions(-)
sound/pci/hda/hda_sysfs.c +0 -8
@@ -141,14 +141,6 @@ static int reconfig_codec(struct hda_codec *codec) err =snd_hda_codec_configure (codec);if (err <0 ) goto error; -/* rebuild PCMs */ - err =snd_hda_codec_build_pcms (codec); -if (err <0 ) - goto error; -/* rebuild mixers */ - err =snd_hda_codec_build_controls (codec); -if (err <0 ) - goto error; err =snd_card_register (codec->card); error:snd_hda_power_down (codec);
sound/pci/hda/patch_hdmi.c +3 -4
@@ -3401,6 +3401,9 @@ static int patch_atihdmi(struct hda_codec *codec) spec->ops.pin_hbr_setup = atihdmi_pin_hbr_setup; spec->ops.setup_stream = atihdmi_setup_stream; + spec->chmap.ops.pin_get_slot_channel = atihdmi_pin_get_slot_channel; + spec->chmap.ops.pin_set_slot_channel = atihdmi_pin_set_slot_channel; +if (!has_amd_full_remap_support (codec)) {/* override to ATI/AMD-specific versions with pairwise mapping */ spec->chmap.ops.chmap_cea_alloc_validate_get_type =
@@ -3408,10 +3411,6 @@ static int patch_atihdmi(struct hda_codec *codec) spec->chmap.ops.cea_alloc_to_tlv_chmap = atihdmi_paired_cea_alloc_to_tlv_chmap; spec->chmap.ops.chmap_validate = atihdmi_paired_chmap_validate; - spec->chmap.ops.pin_get_slot_channel = - atihdmi_pin_get_slot_channel; - spec->chmap.ops.pin_set_slot_channel = - atihdmi_pin_set_slot_channel; }/* ATI/AMD converters do not advertise all of their capabilities */
sound/pci/hda/patch_realtek.c +13 -0
@@ -6426,6 +6426,7 @@ enum {ALC668_FIXUP_DELL_DISABLE_AAMIX ,ALC668_FIXUP_DELL_XPS13 , ALC662_FIXUP_ASUS_Nx50, + ALC668_FIXUP_ASUS_Nx51, }; static const struct hda_fixup alc662_fixups[] = {
@@ -6672,6 +6673,15 @@ static const struct hda_fixup alc662_fixups[] = { .chained = true, .chain_id =ALC662_FIXUP_BASS_1A }, + [ALC668_FIXUP_ASUS_Nx51] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x1a ,0x90170151 },/* bass speaker */ + {} + }, + .chained = true, + .chain_id = ALC662_FIXUP_BASS_CHMAP, + }, };static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -6694,11 +6704,14 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0698 ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x069f ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x103c ,0x1632 ,"HP RP5800" ,ALC662_FIXUP_HP_RP5800 ), +SND_PCI_QUIRK (0x1043 ,0x1080 ,"Asus UX501VW" ,ALC668_FIXUP_HEADSET_MODE ),SND_PCI_QUIRK (0x1043 ,0x11cd ,"Asus N550" , ALC662_FIXUP_ASUS_Nx50),SND_PCI_QUIRK (0x1043 ,0x13df ,"Asus N550JX" ,ALC662_FIXUP_BASS_1A ),SND_PCI_QUIRK (0x1043 ,0x129d ,"Asus N750" , ALC662_FIXUP_ASUS_Nx50),SND_PCI_QUIRK (0x1043 ,0x1477 ,"ASUS N56VZ" ,ALC662_FIXUP_BASS_MODE4_CHMAP ),SND_PCI_QUIRK (0x1043 ,0x15a7 ,"ASUS UX51VZH" ,ALC662_FIXUP_BASS_16 ), +SND_PCI_QUIRK (0x1043 ,0x177d ,"ASUS N551" , ALC668_FIXUP_ASUS_Nx51), +SND_PCI_QUIRK (0x1043 ,0x17bd ,"ASUS N751" , ALC668_FIXUP_ASUS_Nx51),SND_PCI_QUIRK (0x1043 ,0x1b73 ,"ASUS N55SF" ,ALC662_FIXUP_BASS_16 ),SND_PCI_QUIRK (0x1043 ,0x1bf3 ,"ASUS N76VZ" ,ALC662_FIXUP_BASS_MODE4_CHMAP ), SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
sound/usb/quirks.c +3 -0
@@ -1137,8 +1137,11 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)case USB_ID (0x047F ,0x0415 ):/* Plantronics BT-300 */ case USB_ID (0x047F ,0xAA05 ):/* Plantronics DA45 */ case USB_ID (0x04D8 ,0xFEEA ):/* Benchmark DAC1 Pre */ +case USB_ID (0x0556 ,0x0014 ):/* Phoenix Audio TMX320VC */ case USB_ID (0x074D ,0x3553 ):/* Outlaw RR2150 (Micronas UAC3553B) */ +case USB_ID (0x1de7 ,0x0013 ):/* Phoenix Audio MT202exe */ case USB_ID (0x1de7 ,0x0014 ):/* Phoenix Audio TMX320 */ +case USB_ID (0x1de7 ,0x0114 ):/* Phoenix Audio MT202pcs */ case USB_ID (0x21B4 ,0x0081 ):/* AudioQuest DragonFly */ return true; }