Skip to content

Commit

Permalink
ASoC: Add a cache_sync bit to the CODEC structure
Browse files Browse the repository at this point in the history
Add a bit to the CODEC structure indicating if a cache sync is required.
By default this will be set if a cache only write is done to a soc-cache
register cache.  This allows us to avoid syncing the cache back after
using cache only writes if there were no changes.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown committed Feb 4, 2010
1 parent 8c961bc commit a3032b4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
1 change: 1 addition & 0 deletions include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ struct snd_soc_codec {

unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
unsigned int cache_only:1; /* Suppress writes to hardware */
unsigned int cache_sync:1; /* Cache needs to be synced to hardware */

/* dapm */
u32 pop_time;
Expand Down
20 changes: 15 additions & 5 deletions sound/soc/soc-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg,
if (reg < codec->reg_cache_size)
cache[reg] = value;

if (codec->cache_only)
if (codec->cache_only) {
codec->cache_sync = 1;
return 0;
}

ret = codec->hw_write(codec->control_data, data, 2);
if (ret == 2)
Expand Down Expand Up @@ -105,8 +107,10 @@ static int snd_soc_7_9_write(struct snd_soc_codec *codec, unsigned int reg,
if (reg < codec->reg_cache_size)
cache[reg] = value;

if (codec->cache_only)
if (codec->cache_only) {
codec->cache_sync = 1;
return 0;
}

ret = codec->hw_write(codec->control_data, data, 2);
if (ret == 2)
Expand Down Expand Up @@ -161,8 +165,10 @@ static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg,
if (reg < codec->reg_cache_size)
cache[reg] = value;

if (codec->cache_only)
if (codec->cache_only) {
codec->cache_sync = 1;
return 0;
}

if (codec->hw_write(codec->control_data, data, 2) == 2)
return 0;
Expand Down Expand Up @@ -192,8 +198,10 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
if (!snd_soc_codec_volatile_register(codec, reg))
reg_cache[reg] = value;

if (codec->cache_only)
if (codec->cache_only) {
codec->cache_sync = 1;
return 0;
}

if (codec->hw_write(codec->control_data, data, 3) == 3)
return 0;
Expand Down Expand Up @@ -313,8 +321,10 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg,
if (reg < codec->reg_cache_size)
cache[reg] = value;

if (codec->cache_only)
if (codec->cache_only) {
codec->cache_sync = 1;
return 0;
}

ret = codec->hw_write(codec->control_data, data, 3);
if (ret == 3)
Expand Down

0 comments on commit a3032b4

Please sign in to comment.