ASoC: Use regmap update bits operation for drivers using regmap
PATCH 1/1 ASoC: Use regmap update bits operation for drivers using regmap
If a driver is using regmap directly ensure that we're coherent with non-ASoC register updates by using the regmap API directly to do our read/modify/write cycles. This will bypass the ASoC cache but drivers using regmap directly should not be using the ASoC cache.
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc.h | 1 + sound/soc/soc-core.c | 25 +++++++++++++++---------- sound/soc/soc-dapm.c | 27 +++++++++++++++++---------- sound/soc/soc-io.c | 1 + 4 files changed, 34 insertions(+), 20 deletions(-)
include/sound/soc.h +1 -0
@@ -559,6 +559,7 @@ struct snd_soc_codec { unsigned int ac97_created:1; /* Codec has been created by SoC */ unsigned int sysfs_registered:1; /* codec has been sysfs registered */ unsigned int cache_init:1; /* codec cache has been initialized */ + unsigned int using_regmap:1; /* using regmap access */u32 cache_only;/* Suppress writes to hardware */ u32 cache_sync;/* Cache needs to be synced to hardware */
sound/soc/soc-core.c +15 -10
@@ -1865,23 +1865,28 @@ EXPORT_SYMBOL_GPL(snd_soc_bulk_write_raw);int snd_soc_update_bits (struct snd_soc_codec *codec,unsigned short reg,unsigned int mask,unsigned int value) { -int change; +bool change;unsigned int old, new;int ret; - ret =snd_soc_read (codec, reg); -if (ret <0 ) -return ret; - - old = ret; - new = (old & ~mask) | (value & mask); - change = old != new; -if (change) { - ret =snd_soc_write (codec, reg, new); +if (codec->using_regmap) { + ret =regmap_update_bits_check (codec->control_data, reg, + mask, value, &change); + }else { + ret =snd_soc_read (codec, reg);if (ret <0 )return ret; + + old = ret; + new = (old & ~mask) | (value & mask); + change = old != new; +if (change) + ret =snd_soc_write (codec, reg, new); } +if (ret <0 ) +return ret; +return change; }EXPORT_SYMBOL_GPL (snd_soc_update_bits);
sound/soc/soc-dapm.c +17 -10
@@ -197,21 +197,28 @@ static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg, int val)static int soc_widget_update_bits (struct snd_soc_dapm_widget *w,unsigned short reg,unsigned int mask,unsigned int value) { -int change; +bool change;unsigned int old, new;int ret; - ret =soc_widget_read (w, reg); -if (ret <0 ) -return ret; - - old = ret; - new = (old & ~mask) | (value & mask); - change = old != new; -if (change) { - ret =soc_widget_write (w, reg, new); +if (w->codec && w->codec->using_regmap) { + ret =regmap_update_bits_check (w->codec->control_data, + reg, mask, value, &change); +if (ret !=0 ) +return ret; + }else { + ret =soc_widget_read (w, reg);if (ret <0 )return ret; + + old = ret; + new = (old & ~mask) | (value & mask); + change = old != new; +if (change) { + ret =soc_widget_write (w, reg, new); +if (ret <0 ) +return ret; + } }return change;
sound/soc/soc-io.c +1 -0
@@ -140,6 +140,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,case SND_SOC_REGMAP :/* Device has made its own regmap arrangements */ + codec->using_regmap = true;break ;default :
Signature · 1 line
1.7.7.3