summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-04 12:41:04 +0000
committerVarun Colbert <vcolbert@nvidia.com>2011-03-29 17:19:28 -0700
commit27ab1cc06532f59a7ecf1fd3f59aaac3f5e9da74 (patch)
treee627d893e71ab6c0024fdf1c3d97ff10783a730c /sound
parente2fed6a328212b0757df5067b76e97b89204eede (diff)
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> Cherry-picked from mainline kernel. Change-Id: Ib0a8533e3762dfc67ee21209a28e9a6603d31a37 Reviewed-on: http://git-master/r/23058 Tested-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 03cb7c05ebec..e8a8da0af044 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -152,6 +152,10 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
else
codec->bias_level = level;
}
+ if (ret == 0) {
+ if (card && card->set_bias_level_post)
+ ret = card->set_bias_level_post(card, level);
+ }
return ret;
}