Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b5f90d authored May 20, 2014 by Linus Torvalds

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

Pull sound fixes from Takashi Iwai:
 "Unfortunately this update became bigger than previous pull requests,
  which is almost a pattern in rc5-6.  But, the only obvious big changes
  are for the new Intel DSP ASoC drivers, so the impact must be fairly
  limited.

  Other than that, usual small fixes in various fields: HD-audio, ASoC
  core and ASoC fsl and codec drivers"

* tag 'sound-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
  ALSA: sb_mixer: missing return statement
  ASoC: wm8962: Update register CLASS_D_CONTROL_1 to be non-volatile
  ASoC: Intel: Fix Baytrail SST DSP firmware loading
  ALSA: hda - mask buggy stream DMA0 for Broadwell display controller
  ALSA: hda - Add new GPU codec ID to snd-hda
  ASoC: fsl_esai: Set PCRC and PRRC registers at the end of hw_params()
  ASoC: fsl_esai: Only bypass sck_div for EXTAL source
  ASoC: fsl_esai: Fix incorrect condition within ratio range check for FP
  ASoC: dapm: Fix SUSPEND -> OFF bias sequence
  ASoC: dapm: Skip CODEC<->CODEC links in connect_dai_link_widgets()
  ASoC: pcm: Fix incorrect condition check for case SNDRV_PCM_TRIGGER_SUSPEND
  ALSA: hda - add headset mic detect quirks for three Dell laptops
  ASoC: Update Cirrus Logic CODEC maintainers.
  ASoC: Intel: Fix block offset calculations.
  ASoC: Intel: Fix check for pdata usage before dereference.
  ASoC: Intel: Fix stream position pointer.
  ASoC: Intel: Fix allow hw_params to be called more than once.
  ASoC: Intel: Fix Audio DSP usage when IOMMU is enabled.
  ASoC: Intel: Fix Haswell/Broadwell DSP page table creation.
  ASoC: Intel: Fix allocated block list usage when adding blocks.
  ...

parents c7d6891a 665ebe92

MAINTAINERS

+0 −6

Original line number	Diff line number	Diff line
		@@ -2246,12 +2246,6 @@ L: linux-usb@vger.kernel.org
		S: Maintained
		F: drivers/usb/host/ohci-ep93xx.c

		CIRRUS LOGIC CS4270 SOUND DRIVER
		M: Timur Tabi <timur@tabi.org>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Odd Fixes
		F: sound/soc/codecs/cs4270*

		CIRRUS LOGIC AUDIO CODEC DRIVERS
		M: Brian Austin <brian.austin@cirrus.com>
		M: Paul Handrigan <Paul.Handrigan@cirrus.com>

sound/isa/sb/sb_mixer.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -818,12 +818,14 @@ int snd_sbmixer_new(struct snd_sb *chip)
		return err;
		break;
		case SB_HW_DT019X:
		if ((err = snd_sbmixer_init(chip,
		err = snd_sbmixer_init(chip,
		snd_dt019x_controls,
		ARRAY_SIZE(snd_dt019x_controls),
		snd_dt019x_init_values,
		ARRAY_SIZE(snd_dt019x_init_values),
		"DT019X")) < 0)
		"DT019X");
		if (err < 0)
		return err;
		break;
		default:
		strcpy(card->mixername, "???");

sound/pci/hda/hda_intel.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1367,6 +1367,12 @@ static int azx_first_init(struct azx *chip)
		/* initialize streams */
		azx_init_stream(chip);

		/* workaround for Broadwell HDMI: the first stream is broken,
		* so mask it by keeping it as if opened
		*/
		if (pci->vendor == 0x8086 && pci->device == 0x160c)
		chip->azx_dev[0].opened = 1;

		/* initialize chip */
		azx_init_pci(chip);
		azx_init_chip(chip, (probe_only[dev] & 2) == 0);

sound/pci/hda/patch_hdmi.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3332,6 +3332,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
		{ .id = 0x10de0051, .name = "GPU 51 HDMI/DP", .patch = patch_nvhdmi },
		{ .id = 0x10de0060, .name = "GPU 60 HDMI/DP", .patch = patch_nvhdmi },
		{ .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch },
		{ .id = 0x10de0071, .name = "GPU 71 HDMI/DP", .patch = patch_nvhdmi },
		{ .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch },
		{ .id = 0x11069f80, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi },
		{ .id = 0x11069f81, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi },
		@@ -3387,6 +3388,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0044");
		MODULE_ALIAS("snd-hda-codec-id:10de0051");
		MODULE_ALIAS("snd-hda-codec-id:10de0060");
		MODULE_ALIAS("snd-hda-codec-id:10de0067");
		MODULE_ALIAS("snd-hda-codec-id:10de0071");
		MODULE_ALIAS("snd-hda-codec-id:10de8001");
		MODULE_ALIAS("snd-hda-codec-id:11069f80");
		MODULE_ALIAS("snd-hda-codec-id:11069f81");

sound/pci/hda/patch_realtek.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -4616,6 +4616,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK(0x1028, 0x0653, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x0657, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x0658, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x065c, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x065f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x0662, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x0667, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
		@@ -4624,6 +4625,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
		SND_PCI_QUIRK(0x1028, 0x0674, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x067e, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x067f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x0680, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x0684, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
		SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),