sound fixes for 4.3-rc1
Linus,
please pull sound fixes for v4.3-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-fix-4.3-rc1
The topmost commit is 5ee20bc792467d7d612157e0a9962765aa943b08
----------------------------------------------------------------
sound fixes for 4.3-rc1
A collection of small fixes since the last update: the HD-audio quirks as usual with a USB-audio fix and a trivial fix for the old sparc driver.
----------------------------------------------------------------
Johan Rastén (1):
ALSA: usb-audio: Change internal PCM order
Luis de Bethencourt (1):
ALSA: sparc: amd7930: Fix module autoload for OF platform driver
Niranjan Sivakumar (1):
ALSA: hda - Fix white noise on Dell M3800
Takashi Iwai (2):
ALSA: hda - Enable headphone jack detect on old Fujitsu laptops
ALSA: hda - Use ALC880_FIXUP_FUJITSU for FSC Amilo M1437
Woodrow Shen (1):
ALSA: hda - Add some FIXUP quirks for white noise on Dell laptop.
--- sound/pci/hda/patch_realtek.c | 12 ++++++++---- sound/sparc/amd7930.c | 1 + sound/usb/stream.c | 10 +++++++++- 3 files changed, 18 insertions(+), 5 deletions(-)
sound/pci/hda/patch_realtek.c +8 -4
@@ -1135,7 +1135,7 @@ static const struct hda_fixup alc880_fixups[] = {/* override all pins as BIOS on old Amilo is broken */ .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl []) { - {0x14 ,0x0121411f },/* HP */ + {0x14 ,0x0121401f },/* HP */ {0x15 ,0x99030120 },/* speaker */ {0x16 ,0x99030130 },/* bass speaker */ {0x17 ,0x411111f0 },/* N/A */
@@ -1155,7 +1155,7 @@ static const struct hda_fixup alc880_fixups[] = {/* almost compatible with FUJITSU, but no bass and SPDIF */ .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl []) { - {0x14 ,0x0121411f },/* HP */ + {0x14 ,0x0121401f },/* HP */ {0x15 ,0x99030120 },/* speaker */ {0x16 ,0x411111f0 },/* N/A */ {0x17 ,0x411111f0 },/* N/A */
@@ -1364,7 +1364,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = {SND_PCI_QUIRK (0x161f ,0x203d ,"W810" ,ALC880_FIXUP_W810 ),SND_PCI_QUIRK (0x161f ,0x205d ,"Medion Rim 2150" ,ALC880_FIXUP_MEDION_RIM ),SND_PCI_QUIRK (0x1631 ,0xe011 ,"PB 13201056" ,ALC880_FIXUP_6ST_AUTOMUTE ), -SND_PCI_QUIRK (0x1734 ,0x107c ,"FSC F1734" ,ALC880_FIXUP_F1734 ), +SND_PCI_QUIRK (0x1734 ,0x107c ,"FSC Amilo M1437" ,ALC880_FIXUP_FUJITSU ),SND_PCI_QUIRK (0x1734 ,0x1094 ,"FSC Amilo M1451G" ,ALC880_FIXUP_FUJITSU ),SND_PCI_QUIRK (0x1734 ,0x10ac ,"FSC AMILO Xi 1526" ,ALC880_FIXUP_F1734 ), SND_PCI_QUIRK(0x1734, 0x10b0, "FSC Amilo Pi1556", ALC880_FIXUP_FUJITSU),
@@ -5189,8 +5189,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x06c7 ,"Dell" ,ALC255_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x06d9 ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x06da ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), -SND_PCI_QUIRK (0x1028 ,0x06de ,"Dell" ,ALC292_FIXUP_DISABLE_AAMIX ),SND_PCI_QUIRK (0x1028 ,0x06db ,"Dell" ,ALC292_FIXUP_DISABLE_AAMIX ), +SND_PCI_QUIRK (0x1028 ,0x06dd ,"Dell" ,ALC292_FIXUP_DISABLE_AAMIX ), +SND_PCI_QUIRK (0x1028 ,0x06de ,"Dell" ,ALC292_FIXUP_DISABLE_AAMIX ), +SND_PCI_QUIRK (0x1028 ,0x06df ,"Dell" ,ALC292_FIXUP_DISABLE_AAMIX ), +SND_PCI_QUIRK (0x1028 ,0x06e0 ,"Dell" ,ALC292_FIXUP_DISABLE_AAMIX ),SND_PCI_QUIRK (0x1028 ,0x164a ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x164b ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -6381,6 +6384,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x05db ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x05fe ,"Dell XPS 15" ,ALC668_FIXUP_DELL_XPS13 ),SND_PCI_QUIRK (0x1028 ,0x060a ,"Dell XPS 13" ,ALC668_FIXUP_DELL_XPS13 ), +SND_PCI_QUIRK (0x1028 ,0x060d ,"Dell M3800" ,ALC668_FIXUP_DELL_XPS13 ),SND_PCI_QUIRK (0x1028 ,0x0625 ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x0626 ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1028, 0x0696, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
sound/sparc/amd7930.c +1 -0
@@ -1064,6 +1064,7 @@ static const struct of_device_id amd7930_match[] = { }, {}, }; +MODULE_DEVICE_TABLE (of, amd7930_match);static struct platform_driver amd7930_sbus_driver = { .driver = {
sound/usb/stream.c +9 -1
@@ -377,7 +377,15 @@ int snd_usb_add_audio_stream(struct snd_usb_audio *chip,snd_usb_init_substream (as, stream, fp); -list_add (&as->list, &chip->pcm_list); +/* +* Keep using head insertion for M-Audio Audiophile USB (tm) which has a +* fix to swap capture stream order in conf/cards/USB-audio.conf +*/ +if (chip->usb_id ==USB_ID (0x0763 ,0x2003 )) +list_add (&as->list, &chip->pcm_list); +else +list_add_tail (&as->list, &chip->pcm_list); + chip->pcm_devs++;snd_usb_proc_pcm_format_add (as);