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

Commit d667319a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A bunch of small fixes for ASoC, mainly against regressions due to the
  defaulting regmap i/o, in addition to a HD-audio fixup."

* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: core: Fix check before defaulting to regmap
  ALSA: hda - Support dock on Lenovo Thinkpad T530 with ALC269VC
  ASoC: wm8962: Allow VMID time to fully ramp
  ASoC: AC97 doesn't use regmap by default
  ASoC: sgtl5000: enable VAG_POWER for LINE_IN
  ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements
  ASoC: omap: Add missing modules aliases to get sound working on omap devices
  sound: tegra_alc5632: Adjust to of_get_named_gpio() change
  sound: tegra_wm8903: Adjust to of_get_named_gpio() change
  ASoC: mc13783: Provide codec->control_data
  ASoC: ux500: Include the correct header files
  ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs
  ASoC: sgtl5000: remove unneeded snd_soc_dapm_new_widgets in probe
  ASoC: mxs-saif: set a base clock rate for EXTMASTER mode work
  ASoC: mxs-saif: fix clock prepare and enable unbalance issue
  ASoC: wm8994: Ensure there are enough BCLKs for four channels
parents c4e62d67 ac190c76

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -6206,6 +6206,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_QUANTA_MUTE),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Lenovo Ideapd", ALC269_FIXUP_PCM_44K),

sound/soc/codecs/ab8500-codec.c

+4 −0
Original line number Diff line number Diff line
@@ -2406,6 +2406,10 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) 


	/* Setup AB8500 according to board-settings */

	pdata = (struct ab8500_platform_data *)dev_get_platdata(dev->parent);



	/* Inform SoC Core that we have our own I/O arrangements. */

	codec->control_data = (void *)true;



	status = ab8500_audio_setup_mics(codec, &pdata->codec->amics);

	if (status < 0) {

		pr_err("%s: Failed to setup mics (%d)!\n", __func__, status);

sound/soc/codecs/ad1980.c

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec) 


	printk(KERN_INFO "AD1980 SoC Audio Codec\n");



	codec->control_data = codec;	/* we don't use regmap! */

	ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);

	if (ret < 0) {

		printk(KERN_ERR "ad1980: failed to register AC97 codec\n");

sound/soc/codecs/mc13783.c

+2 −0
Original line number Diff line number Diff line
@@ -581,6 +581,8 @@ static int mc13783_probe(struct snd_soc_codec *codec) 
{

	struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);



	codec->control_data = priv->mc13xxx;



	mc13xxx_lock(priv->mc13xxx);



	/* these are the reset values */

sound/soc/codecs/sgtl5000.c

+1 −2
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = { 
	{"Headphone Mux", "DAC", "DAC"},	/* dac --> hp_mux */

	{"LO", NULL, "DAC"},			/* dac --> line_out */



	{"LINE_IN", NULL, "VAG_POWER"},

	{"Headphone Mux", "LINE_IN", "LINE_IN"},/* line_in --> hp_mux */

	{"HP", NULL, "Headphone Mux"},		/* hp_mux --> hp */
@@ -1357,8 +1358,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) 
	if (ret)

		goto err;



	snd_soc_dapm_new_widgets(&codec->dapm);



	return 0;



err: