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

Commit d4c6005f authored Jun 06, 2011 by Mark Brown

ASoC: Add context parameter to card DAPM callbacks



The card callback will get called for each DAPM context in the card so it
can be useful for it to know which device is currently undergoing a
transition.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

parent 171ec6b0

include/sound/soc.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -726,8 +726,10 @@ struct snd_soc_card {

	/* callbacks */		/* callbacks */
	int (set_bias_level)(struct snd_soc_card ,		int (set_bias_level)(struct snd_soc_card ,
			struct snd_soc_dapm_context *dapm,
	enum snd_soc_bias_level level);		enum snd_soc_bias_level level);
	int (set_bias_level_post)(struct snd_soc_card ,		int (set_bias_level_post)(struct snd_soc_card ,
			struct snd_soc_dapm_context *dapm,
	enum snd_soc_bias_level level);		enum snd_soc_bias_level level);

	long pmdown_time;		long pmdown_time;

sound/soc/atmel/sam9g20_wm8731.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -92,6 +92,7 @@ static struct snd_soc_ops at91sam9g20ek_ops = {
	};		};

	static int at91sam9g20ek_set_bias_level(struct snd_soc_card *card,		static int at91sam9g20ek_set_bias_level(struct snd_soc_card *card,
			struct snd_soc_dapm_context *dapm,
	enum snd_soc_bias_level level)		enum snd_soc_bias_level level)
	{		{
	static int mclk_on;		static int mclk_on;

sound/soc/omap/ams-delta.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -427,6 +427,7 @@ static struct snd_soc_ops ams_delta_ops = {

	/* Board specific codec bias level control */		/* Board specific codec bias level control */
	static int ams_delta_set_bias_level(struct snd_soc_card *card,		static int ams_delta_set_bias_level(struct snd_soc_card *card,
			struct snd_soc_dapm_context *dapm,
	enum snd_soc_bias_level level)		enum snd_soc_bias_level level)
	{		{
	struct snd_soc_codec *codec = card->rtd->codec;		struct snd_soc_codec *codec = card->rtd->codec;

sound/soc/samsung/speyside.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,11 +20,15 @@
	#define WM8915_HPSEL_GPIO 214		#define WM8915_HPSEL_GPIO 214

	static int speyside_set_bias_level(struct snd_soc_card *card,		static int speyside_set_bias_level(struct snd_soc_card *card,
			struct snd_soc_dapm_context *dapm,
	enum snd_soc_bias_level level)		enum snd_soc_bias_level level)
	{		{
	struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;		struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
	int ret;		int ret;

			if (dapm->dev != codec_dai->dev)
			return 0;

	switch (level) {		switch (level) {
	case SND_SOC_BIAS_STANDBY:		case SND_SOC_BIAS_STANDBY:
	ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK2,		ret = snd_soc_dai_set_sysclk(codec_dai, WM8915_SYSCLK_MCLK2,

sound/soc/soc-dapm.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -142,7 +142,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
	trace_snd_soc_bias_level_start(card, level);		trace_snd_soc_bias_level_start(card, level);

	if (card && card->set_bias_level)		if (card && card->set_bias_level)
	ret = card->set_bias_level(card, level);		ret = card->set_bias_level(card, dapm, level);
	if (ret != 0)		if (ret != 0)
	goto out;		goto out;

	@@ -154,7 +154,7 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
	goto out;		goto out;

	if (card && card->set_bias_level_post)		if (card && card->set_bias_level_post)
	ret = card->set_bias_level_post(card, level);		ret = card->set_bias_level_post(card, dapm, level);
	out:		out:
	trace_snd_soc_bias_level_done(card, level);		trace_snd_soc_bias_level_done(card, level);