Commit 9b1be0f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "We have a bit more changes than usual in ASoC here, as it was slipped
  from the previous update.  There are one minr ASoC PCM code fix and
  ASoC dmaengine fix, in addition of a collection of small ASoC driver
  fixes.  The rest are a couple of HD-audio stable fixups, and a
  long-standing fix for the paused stream handling.

  So, all commits look not scary (and hopefully won't give you
  disastrous holiday season)"

* tag 'sound-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Add Dell headset detection quirk for one more laptop model
  ASoC: wm8904: fix DSP mode B configuration
  ASoC: wm_adsp: Add small delay while polling DSP RAM start
  ALSA: Add SNDRV_PCM_STATE_PAUSED case in wait_for_avail function
  ASoC: kirkwood: Fix the CPU DAI rates
  ASoC: wm5110: Correct HPOUT3 DAPM route typo
  ALSA: hda - Add Dell headset detection quirk for three laptop models
  ALSA: hda - Add enable_msi=0 workaround for four HP machines
  ASoC: don't leak on error in snd_dmaengine_pcm_register
  ASoC: fsl: imx-wm8962: Don't update bias_level in machine driver
  ASoC: tegra: fix uninitialized variables in set_fmt
  ASoC: wm8962: Enable SYSCLK provisonally before fetching generated DSPCLK_DIV
  ASoC: sam9x5_wm8731: change to work in DSP A mode
  ASoC: atmel_ssc_dai: add dai trigger ops
  ASoC: soc-pcm: Use valid condition for snd_soc_dai_digital_mute() in hw_free()
parents 86fbf161 356f402d

sound/core/pcm_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -1937,6 +1937,8 @@ static int wait_for_avail(struct snd_pcm_substream *substream, 
		case SNDRV_PCM_STATE_DISCONNECTED:

			err = -EBADFD;

			goto _endloop;

		case SNDRV_PCM_STATE_PAUSED:

			continue;

		}

		if (!tout) {

			snd_printd("%s write error (DMA or IRQ trouble?)\n",

sound/pci/hda/hda_intel.c

+4 −0
Original line number Diff line number Diff line
@@ -3433,6 +3433,10 @@ static void check_probe_mask(struct azx *chip, int dev) 
 * white/black-list for enable_msi

 */

static struct snd_pci_quirk msi_black_list[] = {

	SND_PCI_QUIRK(0x103c, 0x2191, "HP", 0), /* AMD Hudson */

	SND_PCI_QUIRK(0x103c, 0x2192, "HP", 0), /* AMD Hudson */

	SND_PCI_QUIRK(0x103c, 0x21f7, "HP", 0), /* AMD Hudson */

	SND_PCI_QUIRK(0x103c, 0x21fa, "HP", 0), /* AMD Hudson */

	SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */

	SND_PCI_QUIRK(0x1043, 0x81f6, "ASUS", 0), /* nvidia */

	SND_PCI_QUIRK(0x1043, 0x822d, "ASUS", 0), /* Athlon64 X2 + nvidia MCP55 */

sound/pci/hda/patch_realtek.c

+4 −0
Original line number Diff line number Diff line
@@ -4247,12 +4247,16 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0606, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0608, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0609, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0610, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0613, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0614, "Dell Inspiron 3135", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_MONO_SPEAKERS),

	SND_PCI_QUIRK(0x1028, 0x061f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0629, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS),

	SND_PCI_QUIRK(0x1028, 0x063e, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x063f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0640, "Dell", ALC255_FIXUP_DELL1_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),

sound/soc/atmel/atmel_ssc_dai.c

+29 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, 


	dma_params = ssc_p->dma_params[dir];



	ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_enable);

	ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_disable);

	ssc_writel(ssc_p->ssc->regs, IDR, dma_params->mask->ssc_error);



	pr_debug("%s enabled SSC_SR=0x%08x\n",
@@ -657,6 +657,33 @@ static int atmel_ssc_prepare(struct snd_pcm_substream *substream, 
	return 0;

}



static int atmel_ssc_trigger(struct snd_pcm_substream *substream,

			     int cmd, struct snd_soc_dai *dai)

{

	struct atmel_ssc_info *ssc_p = &ssc_info[dai->id];

	struct atmel_pcm_dma_params *dma_params;

	int dir;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

		dir = 0;

	else

		dir = 1;



	dma_params = ssc_p->dma_params[dir];



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_enable);

		break;

	default:

		ssc_writel(ssc_p->ssc->regs, CR, dma_params->mask->ssc_disable);

		break;

	}



	return 0;

}



#ifdef CONFIG_PM

static int atmel_ssc_suspend(struct snd_soc_dai *cpu_dai)
@@ -731,6 +758,7 @@ static const struct snd_soc_dai_ops atmel_ssc_dai_ops = { 
	.startup	= atmel_ssc_startup,

	.shutdown	= atmel_ssc_shutdown,

	.prepare	= atmel_ssc_prepare,

	.trigger	= atmel_ssc_trigger,

	.hw_params	= atmel_ssc_hw_params,

	.set_fmt	= atmel_ssc_set_dai_fmt,

	.set_clkdiv	= atmel_ssc_set_dai_clkdiv,

sound/soc/atmel/sam9x5_wm8731.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) 
	dai->stream_name = "WM8731 PCM";

	dai->codec_dai_name = "wm8731-hifi";

	dai->init = sam9x5_wm8731_init;

	dai->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

	dai->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF

		| SND_SOC_DAIFMT_CBM_CFM;



	ret = snd_soc_of_parse_card_name(card, "atmel,model");

CRA Git | Maintained and supported by SUSTech CRA and CCSE