diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 13:40:30 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 18:23:29 -0400 |
| commit | 33c5f969b969c277e96cd9e9bf8472c4b8709c25 (patch) | |
| tree | c43604f07c0f54173fb99f9f64cc36616ec192f8 | |
| parent | 1661699aaa64e6024770ea7adff4fc6216cb25ca (diff) | |
ASoC: Allow idle_bias_off to be specified in CODEC drivers
If devices can unconditionally support idle_bias_off let them flag it in
their driver structure.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
| -rw-r--r-- | include/sound/soc.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 3fe658eea28b..6da55a17fcfd 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -633,6 +633,7 @@ struct snd_soc_codec_driver { | |||
| 633 | /* codec bias level */ | 633 | /* codec bias level */ |
| 634 | int (*set_bias_level)(struct snd_soc_codec *, | 634 | int (*set_bias_level)(struct snd_soc_codec *, |
| 635 | enum snd_soc_bias_level level); | 635 | enum snd_soc_bias_level level); |
| 636 | bool idle_bias_off; | ||
| 636 | 637 | ||
| 637 | void (*seq_notifier)(struct snd_soc_dapm_context *, | 638 | void (*seq_notifier)(struct snd_soc_dapm_context *, |
| 638 | enum snd_soc_dapm_type, int); | 639 | enum snd_soc_dapm_type, int); |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ae93aa81244c..f8f985a4f2a8 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -956,6 +956,8 @@ static int soc_probe_codec(struct snd_soc_card *card, | |||
| 956 | snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets, | 956 | snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets, |
| 957 | driver->num_dapm_widgets); | 957 | driver->num_dapm_widgets); |
| 958 | 958 | ||
| 959 | codec->dapm.idle_bias_off = driver->idle_bias_off; | ||
| 960 | |||
| 959 | if (driver->probe) { | 961 | if (driver->probe) { |
| 960 | ret = driver->probe(codec); | 962 | ret = driver->probe(codec); |
| 961 | if (ret < 0) { | 963 | if (ret < 0) { |
