Commit 2f727f50 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A few fixes for ASoC (N810 DT init fix, DPCM error path fix and a
  couple of MFD init fixes), and a fix for a Lenovo laptop.  All small
  and trivial fixes, suitable for rc7"

* tag 'sound-3.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: 88pm860: Fix IO setup
  ASoC: si476x: Fix IO setup
  ALSA: hda - Fix loud click noise with IdeaPad 410Y
  ASoC: pcm: free path list before exiting from error conditions
  ASoC: n810: fix init with DT boot
parents 33807f4f 5e3a227a

sound/pci/hda/patch_realtek.c

+19 −0
Original line number Diff line number Diff line
@@ -3616,6 +3616,19 @@ static void alc_fixup_auto_mute_via_amp(struct hda_codec *codec, 
	}

}



static void alc_no_shutup(struct hda_codec *codec)

{

}



static void alc_fixup_no_shutup(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{

	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		struct alc_spec *spec = codec->spec;

		spec->shutup = alc_no_shutup;

	}

}



static void alc_fixup_headset_mode_alc668(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{
@@ -3844,6 +3857,7 @@ enum { 
	ALC269_FIXUP_HP_GPIO_LED,

	ALC269_FIXUP_INV_DMIC,

	ALC269_FIXUP_LENOVO_DOCK,

	ALC269_FIXUP_NO_SHUTUP,

	ALC286_FIXUP_SONY_MIC_NO_PRESENCE,

	ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,

	ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
@@ -4020,6 +4034,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_inv_dmic_0x12,

	},

	[ALC269_FIXUP_NO_SHUTUP] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_no_shutup,

	},

	[ALC269_FIXUP_LENOVO_DOCK] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -4405,6 +4423,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP),

	SND_PCI_QUIRK(0x17aa, 0x5013, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC),

	SND_PCI_QUIRK(0x17aa, 0x5026, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

sound/soc/codecs/88pm860x-codec.c

+3 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,9 @@ static int pm860x_probe(struct snd_soc_codec *codec) 
	pm860x->codec = codec;



	codec->control_data = pm860x->regmap;

	ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);

	if (ret)

		return ret;



	for (i = 0; i < 4; i++) {

		ret = request_threaded_irq(pm860x->irq[i], NULL,

sound/soc/codecs/si476x.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ out: 
static int si476x_codec_probe(struct snd_soc_codec *codec)

{

	codec->control_data = dev_get_regmap(codec->dev->parent, NULL);

	return 0;

	return snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);

}



static struct snd_soc_dai_ops si476x_dai_ops = {

sound/soc/omap/n810.c

+3 −1
Original line number Diff line number Diff line
@@ -305,7 +305,9 @@ static int __init n810_soc_init(void) 
	int err;

	struct device *dev;



	if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax()))

	if (!of_have_populated_dt() ||

	    (!of_machine_is_compatible("nokia,n810") &&

	     !of_machine_is_compatible("nokia,n810-wimax")))

		return -ENODEV;



	n810_snd_device = platform_device_alloc("soc-audio", -1);

sound/soc/soc-pcm.c

+3 −0
Original line number Diff line number Diff line
@@ -1989,6 +1989,7 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card) 


		paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);

		if (paths < 0) {

			dpcm_path_put(&list);

			dev_warn(fe->dev, "ASoC: %s no valid %s path\n",

					fe->dai_link->name,  "playback");

			mutex_unlock(&card->mutex);
@@ -2018,6 +2019,7 @@ capture: 


		paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);

		if (paths < 0) {

			dpcm_path_put(&list);

			dev_warn(fe->dev, "ASoC: %s no valid %s path\n",

					fe->dai_link->name,  "capture");

			mutex_unlock(&card->mutex);
@@ -2082,6 +2084,7 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) 
	fe->dpcm[stream].runtime = fe_substream->runtime;



	if (dpcm_path_get(fe, stream, &list) <= 0) {

		dpcm_path_put(&list);

		dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",

			fe->dai_link->name, stream ? "capture" : "playback");

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE