Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"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"
* tag 'sound-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: Yet another Phoneix Audio device quirk
ALSA: hda - Fix regression on ATI HDMI audio
ALSA: hda - Fix subwoofer pin on ASUS N751 and N551
ALSA: hda - Fix broken reconfig
ALSA: hda - Fix white noise on Asus UX501VW headset
ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2)
+19
-12
-8
sound/pci/hda/hda_sysfs.c
-8
sound/pci/hda/hda_sysfs.c
···
141
141
err = snd_hda_codec_configure(codec);
142
142
if (err < 0)
143
143
goto error;
144
-
/* rebuild PCMs */
145
-
err = snd_hda_codec_build_pcms(codec);
146
-
if (err < 0)
147
-
goto error;
148
-
/* rebuild mixers */
149
-
err = snd_hda_codec_build_controls(codec);
150
-
if (err < 0)
151
-
goto error;
152
144
err = snd_card_register(codec->card);
153
145
error:
154
146
snd_hda_power_down(codec);
+3
-4
sound/pci/hda/patch_hdmi.c
+3
-4
sound/pci/hda/patch_hdmi.c
···
3401
3401
spec->ops.pin_hbr_setup = atihdmi_pin_hbr_setup;
3402
3402
spec->ops.setup_stream = atihdmi_setup_stream;
3403
3403
3404
+
spec->chmap.ops.pin_get_slot_channel = atihdmi_pin_get_slot_channel;
3405
+
spec->chmap.ops.pin_set_slot_channel = atihdmi_pin_set_slot_channel;
3406
+
3404
3407
if (!has_amd_full_remap_support(codec)) {
3405
3408
/* override to ATI/AMD-specific versions with pairwise mapping */
3406
3409
spec->chmap.ops.chmap_cea_alloc_validate_get_type =
···
3411
3408
spec->chmap.ops.cea_alloc_to_tlv_chmap =
3412
3409
atihdmi_paired_cea_alloc_to_tlv_chmap;
3413
3410
spec->chmap.ops.chmap_validate = atihdmi_paired_chmap_validate;
3414
-
spec->chmap.ops.pin_get_slot_channel =
3415
-
atihdmi_pin_get_slot_channel;
3416
-
spec->chmap.ops.pin_set_slot_channel =
3417
-
atihdmi_pin_set_slot_channel;
3418
3411
}
3419
3412
3420
3413
/* ATI/AMD converters do not advertise all of their capabilities */
+13
sound/pci/hda/patch_realtek.c
+13
sound/pci/hda/patch_realtek.c
···
6426
6426
ALC668_FIXUP_DELL_DISABLE_AAMIX,
6427
6427
ALC668_FIXUP_DELL_XPS13,
6428
6428
ALC662_FIXUP_ASUS_Nx50,
6429
+
ALC668_FIXUP_ASUS_Nx51,
6429
6430
};
6430
6431
6431
6432
static const struct hda_fixup alc662_fixups[] = {
···
6673
6672
.chained = true,
6674
6673
.chain_id = ALC662_FIXUP_BASS_1A
6675
6674
},
6675
+
[ALC668_FIXUP_ASUS_Nx51] = {
6676
+
.type = HDA_FIXUP_PINS,
6677
+
.v.pins = (const struct hda_pintbl[]) {
6678
+
{0x1a, 0x90170151}, /* bass speaker */
6679
+
{}
6680
+
},
6681
+
.chained = true,
6682
+
.chain_id = ALC662_FIXUP_BASS_CHMAP,
6683
+
},
6676
6684
};
6677
6685
6678
6686
static const struct snd_pci_quirk alc662_fixup_tbl[] = {
···
6704
6694
SND_PCI_QUIRK(0x1028, 0x0698, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
6705
6695
SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
6706
6696
SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
6697
+
SND_PCI_QUIRK(0x1043, 0x1080, "Asus UX501VW", ALC668_FIXUP_HEADSET_MODE),
6707
6698
SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_ASUS_Nx50),
6708
6699
SND_PCI_QUIRK(0x1043, 0x13df, "Asus N550JX", ALC662_FIXUP_BASS_1A),
6709
6700
SND_PCI_QUIRK(0x1043, 0x129d, "Asus N750", ALC662_FIXUP_ASUS_Nx50),
6710
6701
SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
6711
6702
SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),
6703
+
SND_PCI_QUIRK(0x1043, 0x177d, "ASUS N551", ALC668_FIXUP_ASUS_Nx51),
6704
+
SND_PCI_QUIRK(0x1043, 0x17bd, "ASUS N751", ALC668_FIXUP_ASUS_Nx51),
6712
6705
SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),
6713
6706
SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
6714
6707
SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
+3
sound/usb/quirks.c
+3
sound/usb/quirks.c
···
1137
1137
case USB_ID(0x047F, 0x0415): /* Plantronics BT-300 */
1138
1138
case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */
1139
1139
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
1140
+
case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */
1140
1141
case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
1142
+
case USB_ID(0x1de7, 0x0013): /* Phoenix Audio MT202exe */
1141
1143
case USB_ID(0x1de7, 0x0014): /* Phoenix Audio TMX320 */
1144
+
case USB_ID(0x1de7, 0x0114): /* Phoenix Audio MT202pcs */
1142
1145
case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */
1143
1146
return true;
1144
1147
}