Commit 30812cca authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: da732x: Use da732x->regmap instead of codec->control_data

With the ongoing component-ization of the ASoC framework and the continuing
migration to using regmap for IO the control_data field of the snd_soc_codec
struct will eventually be removed. Prepare the da732x driver for this by using
da732x->regmap instead of accessing the CODEC's control_data field.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent eeecf1a3
...@@ -1471,8 +1471,8 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, ...@@ -1471,8 +1471,8 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
da732x_hp_dc_offset_cancellation(codec); da732x_hp_dc_offset_cancellation(codec);
regcache_cache_only(codec->control_data, false); regcache_cache_only(da732x->regmap, false);
regcache_sync(codec->control_data); regcache_sync(da732x->regmap);
} else { } else {
snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, snd_soc_update_bits(codec, DA732X_REG_BIAS_EN,
DA732X_BIAS_BOOST_MASK, DA732X_BIAS_BOOST_MASK,
...@@ -1483,7 +1483,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, ...@@ -1483,7 +1483,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
} }
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
regcache_cache_only(codec->control_data, true); regcache_cache_only(da732x->regmap, true);
da732x_set_charge_pump(codec, DA732X_DISABLE_CP); da732x_set_charge_pump(codec, DA732X_DISABLE_CP);
snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_EN, snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_EN,
DA732X_BIAS_DIS); DA732X_BIAS_DIS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment