aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8996.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-01-27 05:02:09 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-27 06:22:05 -0500
commiteb3032f8b9c06b3ff06a318aa5842c5e14e1fa95 (patch)
tree3c3a6e1faf2ab9812205c8984581f814c701136a /sound/soc/codecs/wm8996.c
parent7c08b51f2fbb76b768d78ca6b0e13155d2c1e811 (diff)
ASoC: Set idle_bias_off flag in snd_soc_codec_driver
Since commit 33c5f969 "ASoC: Allow idle_bias_off to be specified in CODEC drivers", now we can set idle_bias_off flag in struct snd_soc_codec_driver for devices can unconditionally support idle_bias_off. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8996.c')
-rw-r--r--sound/soc/codecs/wm8996.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index cde11ca9d9e..7f7e914f5a9 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2804,7 +2804,6 @@ static int wm8996_probe(struct snd_soc_codec *codec)
2804 int ret; 2804 int ret;
2805 struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); 2805 struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
2806 struct i2c_client *i2c = to_i2c_client(codec->dev); 2806 struct i2c_client *i2c = to_i2c_client(codec->dev);
2807 struct snd_soc_dapm_context *dapm = &codec->dapm;
2808 int i, irq_flags; 2807 int i, irq_flags;
2809 2808
2810 wm8996->codec = codec; 2809 wm8996->codec = codec;
@@ -2812,8 +2811,6 @@ static int wm8996_probe(struct snd_soc_codec *codec)
2812 init_completion(&wm8996->dcs_done); 2811 init_completion(&wm8996->dcs_done);
2813 init_completion(&wm8996->fll_lock); 2812 init_completion(&wm8996->fll_lock);
2814 2813
2815 dapm->idle_bias_off = true;
2816
2817 codec->control_data = wm8996->regmap; 2814 codec->control_data = wm8996->regmap;
2818 2815
2819 ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); 2816 ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP);
@@ -3067,6 +3064,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8996 = {
3067 .probe = wm8996_probe, 3064 .probe = wm8996_probe,
3068 .remove = wm8996_remove, 3065 .remove = wm8996_remove,
3069 .set_bias_level = wm8996_set_bias_level, 3066 .set_bias_level = wm8996_set_bias_level,
3067 .idle_bias_off = true,
3070 .seq_notifier = wm8996_seq_notifier, 3068 .seq_notifier = wm8996_seq_notifier,
3071 .controls = wm8996_snd_controls, 3069 .controls = wm8996_snd_controls,
3072 .num_controls = ARRAY_SIZE(wm8996_snd_controls), 3070 .num_controls = ARRAY_SIZE(wm8996_snd_controls),