summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-04 12:41:04 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-06 12:41:30 +0000
commit1badabd980da3bc09933c14970017067940ecd57 (patch)
tree09a22fa6f11aa2445dbc0ee9c2e0f1c7347caf92
parent28216bf48bbe4314a7a02b7c9822dbb26aca530c (diff)
downloadlinux-1badabd980da3bc09933c14970017067940ecd57.tar.bz2
ASoC: Add post-CODEC bias level callback for machine driver
Currently the machine driver can only do bias level configuration before the CODEC bias level is brought up. This means that the machine cannot do any configuration which depends on the CODEC bias level being maintained. Provide a post-CODEC callback which allows the machine driver to do things like enable the FLL on a CODEC which is brought down to BIAS_OFF when idle. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--include/sound/soc.h2
-rw-r--r--sound/soc/soc-dapm.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0eea08e1bdd5..4abc2f8fe77a 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -632,6 +632,8 @@ struct snd_soc_card {
/* callbacks */
int (*set_bias_level)(struct snd_soc_card *,
enum snd_soc_bias_level level);
+ int (*set_bias_level_post)(struct snd_soc_card *,
+ enum snd_soc_bias_level level);
long pmdown_time;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 6a29d59dabaf..9af2d8ad0895 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -162,6 +162,10 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_card *card,
else
dapm->bias_level = level;
}
+ if (ret == 0) {
+ if (card && card->set_bias_level_post)
+ ret = card->set_bias_level_post(card, level);
+ }
trace_snd_soc_bias_level_done(card, level);