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

Commit 09759d1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A usual pattern of half ASoC and half HD-audio fixes, although
  HD-audio fixups have more volumes, in addition to a couple of trivial
  fixes.  Nothing to worry much is found here.

  For ASoC side: a few fixes for PCM rate constraints calculations,
  regmap byte-order fix, the rest driver specific fixes (atmel, fsl,
  omap, kirkwood, wm codecs).

  For HD-audio: Dell headset and mono out fix, ELD update in polling
  mode, ALC283 Chromebook fixes, a few fixes for old AD codecs and
  MBA2, one regression fix"

* tag 'sound-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits)
  ALSA: hda - Fix silent output on MacBook Air 2,1
  ALSA: hda - Fix missing ELD info when using jackpoll_ms parameter
  ALSA: hda/realtek - remove hp_automute_hook from alc283_fixup_chromebook
  ASoC: wm8731: fix dsp mode configuration
  ALSA: hda/realtek - Independent of model for HP
  ALSA: hda - Fix headset mic input after muted internal mic (Dell/Realtek)
  ALSA: hda - Use always amps for auto-mute on AD1986A codec
  ALSA: hda/analog - Handle inverted EAPD properly in vmaster hook
  ALSA: hda - Another fixup for ASUS laptop with ALC660 codec
  ALSA: atmel: Fix possible array overflow
  ALSA: hda - Fix complete_all() timing in deferred probes
  ALSA: hda - Fix bad EAPD setup for HP machines with AD1984A
  ASoC: core: fix devres parameter in devm_snd_soc_register_card()
  ASoC: omap: n810: Convert to clk_prepare_enable/clk_disable_unprepare
  ASoC: fsl: set correct platform drvdata in pcm030_fabric_probe()
  ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
  ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation
  ALSA: hda - Fix silent output on ASUS W7J laptop
  ASoC: core: Use consistent byte ordering in snd_soc_bytes_get
  ALSA: dice: fix array limits in dice_proc_read()
  ...
parents da1965d3 0756f09c

include/sound/soc-dapm.h

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ struct device; 
	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_mux, .name = wname, .reg = wreg, \

{	.id = snd_soc_dapm_mux, .name = wname, \

	SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \

	.kcontrol_news = wcontrols, .num_kcontrols = 1}

#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \

{	.id = snd_soc_dapm_virt_mux, .name = wname, \

sound/atmel/abdac.c

+2 −1
Original line number Diff line number Diff line
@@ -357,7 +357,8 @@ static int set_sample_rates(struct atmel_abdac *dac) 
		if (new_rate < 0)

			break;

		/* make sure we are below the ABDAC clock */

		if (new_rate <= clk_get_rate(dac->pclk)) {

		if (index < MAX_NUM_RATES &&

		    new_rate <= clk_get_rate(dac->pclk)) {

			dac->rates[index] = new_rate / 256;

			index++;

		}

sound/firewire/dice.c

+2 −2
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ static void dice_proc_read(struct snd_info_entry *entry, 


	if (dice_proc_read_mem(dice, &tx_rx_header, sections[2], 2) < 0)

		return;

	quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.tx));

	quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.tx) / 4);

	for (stream = 0; stream < tx_rx_header.number; ++stream) {

		if (dice_proc_read_mem(dice, &buf.tx, sections[2] + 2 +

				       stream * tx_rx_header.size,
@@ -1045,7 +1045,7 @@ static void dice_proc_read(struct snd_info_entry *entry, 


	if (dice_proc_read_mem(dice, &tx_rx_header, sections[4], 2) < 0)

		return;

	quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.rx));

	quadlets = min_t(u32, tx_rx_header.size, sizeof(buf.rx) / 4);

	for (stream = 0; stream < tx_rx_header.number; ++stream) {

		if (dice_proc_read_mem(dice, &buf.rx, sections[4] + 2 +

				       stream * tx_rx_header.size,

sound/pci/hda/hda_intel.c

+5 −4
Original line number Diff line number Diff line
@@ -3876,6 +3876,7 @@ static int azx_probe(struct pci_dev *pci, 
	}



	dev++;

	if (chip->disabled)

		complete_all(&chip->probe_wait);

	return 0;
@@ -3953,10 +3954,10 @@ static int azx_probe_continue(struct azx *chip) 
	if ((chip->driver_caps & AZX_DCAPS_PM_RUNTIME) || chip->use_vga_switcheroo)

		pm_runtime_put_noidle(&pci->dev);



	return 0;



out_free:

	if (err < 0)

		chip->init_failed = 1;

	complete_all(&chip->probe_wait);

	return err;

}

sound/pci/hda/patch_analog.c

+6 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ static void ad_vmaster_eapd_hook(void *private_data, int enabled) 


	if (!spec->eapd_nid)

		return;

	if (codec->inv_eapd)

		enabled = !enabled;

	snd_hda_codec_update_cache(codec, spec->eapd_nid, 0,

				   AC_VERB_SET_EAPD_BTLENABLE,

				   enabled ? 0x02 : 0x00);
@@ -359,6 +361,9 @@ static int patch_ad1986a(struct hda_codec *codec) 
	 */

	spec->gen.multiout.no_share_stream = 1;



	/* AD1986A can't manage the dynamic pin on/off smoothly */

	spec->gen.auto_mute_via_amp = 1;



	snd_hda_pick_fixup(codec, ad1986a_fixup_models, ad1986a_fixup_tbl,

			   ad1986a_fixups);

	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -962,6 +967,7 @@ static void ad1884_fixup_hp_eapd(struct hda_codec *codec, 
	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->gen.vmaster_mute.hook = ad1884_vmaster_hp_gpio_hook;

		spec->gen.own_eapd_ctl = 1;

		snd_hda_sequence_write_cache(codec, gpio_init_verbs);

		break;

	case HDA_FIXUP_ACT_PROBE: