From e473d94714e3446a4f38cc853a484301fe658c9a Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 30 Jan 2013 21:35:44 +0800 Subject: [PATCH] --- yaml --- r: 353447 b: refs/heads/master c: 3f3af6eeff3e048e27eb864519e779aedc194386 h: refs/heads/master i: 353445: 36f7c8fb85ee6dd28ba8ee03c61e6307058c6dc1 353443: 3298c8a57d33d69988d5f9ac0aa82aab4e5613ab 353439: 7e5b0bd7de1fe2b6e6a20bfcaefe047602a2762f v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm2000.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 45d714cc3db5..fb7011aec63d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33e7546e199f123808699c65274283606114e225 +refs/heads/master: 3f3af6eeff3e048e27eb864519e779aedc194386 diff --git a/trunk/sound/soc/codecs/wm2000.c b/trunk/sound/soc/codecs/wm2000.c index 627c45499392..cb7fa3c78675 100644 --- a/trunk/sound/soc/codecs/wm2000.c +++ b/trunk/sound/soc/codecs/wm2000.c @@ -650,6 +650,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol, } static const struct snd_kcontrol_new wm2000_controls[] = { + SOC_SINGLE("ANC Volume", WM2000_REG_ANC_GAIN_CTRL, 0, 255, 0), SOC_SINGLE_BOOL_EXT("WM2000 ANC Switch", 0, wm2000_anc_mode_get, wm2000_anc_mode_put), @@ -755,6 +756,8 @@ static int wm2000_probe(struct snd_soc_codec *codec) { struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); + snd_soc_codec_set_cache_io(codec, 16, 8, SND_SOC_REGMAP); + /* This will trigger a transition to standby mode by default */ wm2000_anc_set_mode(wm2000);