Commit 96dd3622 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Make pmdown_time a per-card setting 



Make the pmdown_time a per-card setting rather than a global one,
initialised before the card initialisation runs. This allows cards
to override the default setting if it makes sense to do so (for
example, due to an unavoidable pop).

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 3a66d387

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -521,6 +521,8 @@ struct snd_soc_card { 
	int (*set_bias_level)(struct snd_soc_card *,

			      enum snd_soc_bias_level level);



	int pmdown_time;



	/* CPU <--> Codec DAI links  */

	struct snd_soc_dai_link *dai_link;

	int num_links;

sound/soc/soc-core.c

+3 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static int soc_codec_close(struct snd_pcm_substream *substream) 
		/* start delayed pop wq here for playback streams */

		codec_dai->pop_wait = 1;

		schedule_delayed_work(&card->delayed_work,

			msecs_to_jiffies(pmdown_time));

			msecs_to_jiffies(card->pmdown_time));

	} else {

		/* capture streams can be powered down now */

		snd_soc_dapm_stream_event(codec,
@@ -1039,6 +1039,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) 
	dev_dbg(card->dev, "All components present, instantiating\n");



	/* Found everything, bring it up */

	card->pmdown_time = pmdown_time;



	if (card->probe) {

		ret = card->probe(pdev);

		if (ret < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE