Commit 58ff603b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:

 - A collection of small ASoC driver fixes (error path fixes, register
   correction, regulator bypass mode fix, etc)

 - A few regression fixes and quirks of HD-audio (wrong page attributes
   for SG-buffer, Poulsbo/Oaktrail controller fix, digital mic fix for
   Acer, etc)

 - A fix for USB-audio UAC2 devices wrt FU length check

* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix non-snoop page handling
  ALSA: hda - Enable LPIB delay count for Poulsbo / Oaktrail
  ALSA: hda - fix inverted internal mic on Acer AOA150/ZG5
  ALSA: usb-audio: fix invalid length check for RME and other UAC 2 devices
  ALSA: hda - Add a fixup for Packard-Bell desktop with ALC880
  ASoC: wm_adsp: Release firmware on error
  ASoC: wm_adsp: Use GFP_DMA for things that may be DMAed
  ASoC: arizona: Use actual rather than desired BCLK when calculating LRCLK
  ASoC: wm2200: correct mixer values and text
  ASoC: MAINTAINERS: Update email address.
  ASoC: wm5110: Correct AEC loopback mask
  ASoC: wm5102: Correct AEC loopback mask
  ASoC: dapm: Fix sense of regulator bypass mode
  ASoC: fsl: fix multiple definition of init_module
  ASoC: arizona: Disable free-running mode on FLL1
parents 2e51b231 9ddf1aeb

sound/pci/hda/hda_intel.c

+30 −19
Original line number Diff line number Diff line
@@ -656,29 +656,43 @@ static char *driver_short_names[] = { 
#define get_azx_dev(substream) (substream->runtime->private_data)



#ifdef CONFIG_X86

static void __mark_pages_wc(struct azx *chip, void *addr, size_t size, bool on)

static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on)

{

	int pages;



	if (azx_snoop(chip))

		return;

	if (addr && size) {

		int pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;

	if (!dmab || !dmab->area || !dmab->bytes)

		return;



#ifdef CONFIG_SND_DMA_SGBUF

	if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_SG) {

		struct snd_sg_buf *sgbuf = dmab->private_data;

		if (on)

			set_memory_wc((unsigned long)addr, pages);

			set_pages_array_wc(sgbuf->page_table, sgbuf->pages);

		else

			set_memory_wb((unsigned long)addr, pages);

			set_pages_array_wb(sgbuf->page_table, sgbuf->pages);

		return;

	}

#endif



	pages = (dmab->bytes + PAGE_SIZE - 1) >> PAGE_SHIFT;

	if (on)

		set_memory_wc((unsigned long)dmab->area, pages);

	else

		set_memory_wb((unsigned long)dmab->area, pages);

}



static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf,

				 bool on)

{

	__mark_pages_wc(chip, buf->area, buf->bytes, on);

	__mark_pages_wc(chip, buf, on);

}

static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev,

				   struct snd_pcm_runtime *runtime, bool on)

				   struct snd_pcm_substream *substream, bool on)

{

	if (azx_dev->wc_marked != on) {

		__mark_pages_wc(chip, runtime->dma_area, runtime->dma_bytes, on);

		__mark_pages_wc(chip, snd_pcm_get_dma_buf(substream), on);

		azx_dev->wc_marked = on;

	}

}
@@ -689,7 +703,7 @@ static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf, 
{

}

static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev,

				   struct snd_pcm_runtime *runtime, bool on)

				   struct snd_pcm_substream *substream, bool on)

{

}

#endif
@@ -1968,11 +1982,10 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, 
{

	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);

	struct azx *chip = apcm->chip;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct azx_dev *azx_dev = get_azx_dev(substream);

	int ret;



	mark_runtime_wc(chip, azx_dev, runtime, false);

	mark_runtime_wc(chip, azx_dev, substream, false);

	azx_dev->bufsize = 0;

	azx_dev->period_bytes = 0;

	azx_dev->format_val = 0;
@@ -1980,7 +1993,7 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, 
					params_buffer_bytes(hw_params));

	if (ret < 0)

		return ret;

	mark_runtime_wc(chip, azx_dev, runtime, true);

	mark_runtime_wc(chip, azx_dev, substream, true);

	return ret;

}
@@ -1989,7 +2002,6 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream) 
	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);

	struct azx_dev *azx_dev = get_azx_dev(substream);

	struct azx *chip = apcm->chip;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];



	/* reset BDL address */
@@ -2002,7 +2014,7 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream) 


	snd_hda_codec_cleanup(apcm->codec, hinfo, substream);



	mark_runtime_wc(chip, azx_dev, runtime, false);

	mark_runtime_wc(chip, azx_dev, substream, false);

	return snd_pcm_lib_free_pages(substream);

}
@@ -3613,13 +3625,12 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	/* 5 Series/3400 */

	{ PCI_DEVICE(0x8086, 0x3b56),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },

	/* SCH */

	/* Poulsbo */

	{ PCI_DEVICE(0x8086, 0x811b),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_LPIB }, /* Poulsbo */

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },

	/* Oaktrail */

	{ PCI_DEVICE(0x8086, 0x080a),

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP |

	  AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_LPIB }, /* Oaktrail */

	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },

	/* ICH */

	{ PCI_DEVICE(0x8086, 0x2668),

	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC |

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -4694,6 +4694,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB),

	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),

	SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734),

	SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),

	SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),
@@ -5708,6 +5709,7 @@ static const struct alc_model_fixup alc268_fixup_models[] = { 
};



static const struct snd_pci_quirk alc268_fixup_tbl[] = {

	SND_PCI_QUIRK(0x1025, 0x015b, "Acer AOA 150 (ZG5)", ALC268_FIXUP_INV_DMIC),

	/* below is codec SSID since multiple Toshiba laptops have the

	 * same PCI SSID 1179:ff00

	 */

sound/soc/codecs/arizona.c

+4 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	}

	sr_val = i;



	lrclk = snd_soc_params_to_bclk(params) / params_rate(params);

	lrclk = rates[bclk] / params_rate(params);



	arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",

			rates[bclk], rates[bclk] / lrclk);
@@ -1082,6 +1082,9 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, 
			id, ret);

	}



	regmap_update_bits(arizona->regmap, fll->base + 1,

			   ARIZONA_FLL1_FREERUN, 0);



	return 0;

}

EXPORT_SYMBOL_GPL(arizona_init_fll);

sound/soc/codecs/wm2200.c

+0 −3
Original line number Diff line number Diff line
@@ -1019,8 +1019,6 @@ static const char *wm2200_mixer_texts[] = { 
	"EQR",

	"LHPF1",

	"LHPF2",

	"LHPF3",

	"LHPF4",

	"DSP1.1",

	"DSP1.2",

	"DSP1.3",
@@ -1053,7 +1051,6 @@ static int wm2200_mixer_values[] = { 
	0x25,

	0x50,   /* EQ */

	0x51,

	0x52,

	0x60,   /* LHPF1 */

	0x61,   /* LHPF2 */

	0x68,   /* DSP1 */

sound/soc/codecs/wm5102.c

+1 −2
Original line number Diff line number Diff line
@@ -896,8 +896,7 @@ static const unsigned int wm5102_aec_loopback_values[] = { 


static const struct soc_enum wm5102_aec_loopback =

	SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1,

			      ARIZONA_AEC_LOOPBACK_SRC_SHIFT,

			      ARIZONA_AEC_LOOPBACK_SRC_MASK,

			      ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,

			      ARRAY_SIZE(wm5102_aec_loopback_texts),

			      wm5102_aec_loopback_texts,

			      wm5102_aec_loopback_values);

CRA Git | Maintained and supported by SUSTech CRA and CCSE