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

Commit 804c0a95 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next

parents fffe9b89 26eb5a9a

sound/soc/codecs/arizona.c

+3 −0
Original line number Diff line number Diff line
@@ -1494,6 +1494,9 @@ static int arizona_startup(struct snd_pcm_substream *substream, 
	const struct snd_pcm_hw_constraint_list *constraint;

	unsigned int base_rate;



	if (!substream->runtime)

		return 0;



	switch (dai_priv->clk) {

	case ARIZONA_CLK_SYSCLK:

		base_rate = priv->sysclk;

sound/soc/codecs/wm5110.c

+4 −6
Original line number Diff line number Diff line
@@ -437,18 +437,17 @@ static int wm5110_in_pga_get(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct snd_soc_card *card = dapm->card;

	int ret;



	/*

	 * PGA Volume is also used as part of the enable sequence, so

	 * usage of it should be avoided whilst that is running.

	 */

	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

	snd_soc_dapm_mutex_lock(dapm);



	ret = snd_soc_get_volsw_range(kcontrol, ucontrol);



	mutex_unlock(&card->dapm_mutex);

	snd_soc_dapm_mutex_unlock(dapm);



	return ret;

}
@@ -458,18 +457,17 @@ static int wm5110_in_pga_put(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct snd_soc_card *card = dapm->card;

	int ret;



	/*

	 * PGA Volume is also used as part of the enable sequence, so

	 * usage of it should be avoided whilst that is running.

	 */

	mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);

	snd_soc_dapm_mutex_lock(dapm);



	ret = snd_soc_put_volsw_range(kcontrol, ucontrol);



	mutex_unlock(&card->dapm_mutex);

	snd_soc_dapm_mutex_unlock(dapm);



	return ret;

}