diff options
author | Eric Bénard <eric@eukrea.com> | 2012-04-29 11:37:57 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-30 05:06:44 -0400 |
commit | e875c1e3e758447ba81ca450d89434b3b0496d37 (patch) | |
tree | 88d9fac8a5290e49956dfd7c3624158975755b93 | |
parent | a3a53fe1545a87337cc539f415810128bbdad465 (diff) |
ASoC: tlv312aic23: unbreak resume
* commit f9dfbf9 "ASoC: tlv320aic23: convert to soc-cache" leads to
a bug preventing resumeof the codec as regmap expects a 9 bits data
register but 0xFFFF is passed in tlv320aic23_set_bias_level and this
values gets cached preventing any write to the TLV320AIC23_PWR
register as the final value produced by regmap is (register << 9) | value
* this patch solves the problem by only working on the 9 bits the
register contains.
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
-rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 16d55f91a653..df1e07ffac32 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
@@ -472,7 +472,7 @@ static int tlv320aic23_set_dai_sysclk(struct snd_soc_dai *codec_dai, | |||
472 | static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, | 472 | static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, |
473 | enum snd_soc_bias_level level) | 473 | enum snd_soc_bias_level level) |
474 | { | 474 | { |
475 | u16 reg = snd_soc_read(codec, TLV320AIC23_PWR) & 0xff7f; | 475 | u16 reg = snd_soc_read(codec, TLV320AIC23_PWR) & 0x17f; |
476 | 476 | ||
477 | switch (level) { | 477 | switch (level) { |
478 | case SND_SOC_BIAS_ON: | 478 | case SND_SOC_BIAS_ON: |
@@ -491,7 +491,7 @@ static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, | |||
491 | case SND_SOC_BIAS_OFF: | 491 | case SND_SOC_BIAS_OFF: |
492 | /* everything off, dac mute, inactive */ | 492 | /* everything off, dac mute, inactive */ |
493 | snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x0); | 493 | snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x0); |
494 | snd_soc_write(codec, TLV320AIC23_PWR, 0xffff); | 494 | snd_soc_write(codec, TLV320AIC23_PWR, 0x1ff); |
495 | break; | 495 | break; |
496 | } | 496 | } |
497 | codec->dapm.bias_level = level; | 497 | codec->dapm.bias_level = level; |