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

Commit 7730c0b5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/mc13783',... 

Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/mc13783', 'asoc/fix/uda1380', 'asoc/fix/wm8960' and 'asoc/fix/wm8994' into asoc-linus
parents c2f64237 27796e75 545774bd 810e4425 85e36a1f 17fc2e0a

sound/soc/codecs/mc13783.c

+2 −2
Original line number Diff line number Diff line
@@ -623,14 +623,14 @@ static int mc13783_probe(struct snd_soc_codec *codec) 
				AUDIO_SSI_SEL, 0);

	else

		mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_CODEC,

				0, AUDIO_SSI_SEL);

				AUDIO_SSI_SEL, AUDIO_SSI_SEL);



	if (priv->dac_ssi_port == MC13783_SSI1_PORT)

		mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC,

				AUDIO_SSI_SEL, 0);

	else

		mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC,

				0, AUDIO_SSI_SEL);

				AUDIO_SSI_SEL, AUDIO_SSI_SEL);



	return 0;

}

sound/soc/codecs/uda1380.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static int uda1380_set_dai_fmt_both(struct snd_soc_dai *codec_dai, 
	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)

		return -EINVAL;



	uda1380_write(codec, UDA1380_IFACE, iface);

	uda1380_write_reg_cache(codec, UDA1380_IFACE, iface);



	return 0;

}

sound/soc/codecs/wm8960.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static const struct snd_soc_dapm_route audio_paths[] = { 
	{ "Right Input Mixer", "Boost Switch", "Right Boost Mixer", },

	{ "Right Input Mixer", NULL, "RINPUT1", },  /* Really Boost Switch */

	{ "Right Input Mixer", NULL, "RINPUT2" },

	{ "Right Input Mixer", NULL, "LINPUT3" },

	{ "Right Input Mixer", NULL, "RINPUT3" },



	{ "Left ADC", NULL, "Left Input Mixer" },

	{ "Right ADC", NULL, "Right Input Mixer" },

sound/soc/codecs/wm8994.c

+1 −1
Original line number Diff line number Diff line
@@ -2754,7 +2754,7 @@ static struct { 
};



static int fs_ratios[] = {

	64, 128, 192, 256, 348, 512, 768, 1024, 1408, 1536

	64, 128, 192, 256, 384, 512, 768, 1024, 1408, 1536

};



static int bclk_divs[] = {

sound/soc/davinci/davinci-mcasp.c

+1 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static int davinci_mcasp_suspend(struct snd_soc_dai *dai) 
	u32 reg;

	int i;



	context->pm_state = pm_runtime_enabled(mcasp->dev);

	context->pm_state = pm_runtime_active(mcasp->dev);

	if (!context->pm_state)

		pm_runtime_get_sync(mcasp->dev);