diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-10-15 11:46:02 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-22 11:09:54 +0100 |
| commit | 0d8d293898ff0ea395840cdf2ac85fbd53c8d3ea (patch) | |
| tree | 3cd14ea8d4335439ee1974e5d4c2892f99df5ead /sound/soc | |
| parent | 226d0f22d044f0151287bb7cf334b85182248f0e (diff) | |
| download | linux-stable-0d8d293898ff0ea395840cdf2ac85fbd53c8d3ea.tar.gz linux-stable-0d8d293898ff0ea395840cdf2ac85fbd53c8d3ea.tar.bz2 linux-stable-0d8d293898ff0ea395840cdf2ac85fbd53c8d3ea.zip | |
ASoC: max98095: Convert codec->hw_write to snd_soc_write
codec->hw_write is broken now, convert codec->hw_write to snd_soc_write.
The hardware has 2 banks of registers sharing a section in I2C register space.
The 1st bank is the primary one and is cached.
The 2nd bank is for loading coefficients only and they do not need cache.
These coefficients registers are therefore direct writes.
Thus we set cache_bypass flag to deal with this before calling snd_soc_write.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/max98095.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 6982f743c891..26d7b089fb9c 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -617,14 +617,13 @@ static int max98095_volatile(struct snd_soc_codec *codec, unsigned int reg) static int max98095_hw_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { - u8 data[2]; + int ret; - data[0] = reg; - data[1] = value; - if (codec->hw_write(codec->control_data, data, 2) == 2) - return 0; - else - return -EIO; + codec->cache_bypass = 1; + ret = snd_soc_write(codec, reg, value); + codec->cache_bypass = 0; + + return ret ? -EIO : 0; } /* |