diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-02-22 12:34:45 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-24 23:34:08 -0500 |
commit | 30812cca63600a3e4b44b93ed2ec7e00ce572ee0 (patch) | |
tree | 370c87db99f03acf42a9567ffeed66bf09b563ba /sound/soc/codecs/da732x.c | |
parent | eeecf1a3f9f4791371bf35035ab9b95ab6aab5e7 (diff) |
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: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/da732x.c')
-rw-r--r-- | sound/soc/codecs/da732x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 05f07fb49860..cf9b15472c85 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c | |||
@@ -1471,8 +1471,8 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, | |||
1471 | 1471 | ||
1472 | da732x_hp_dc_offset_cancellation(codec); | 1472 | da732x_hp_dc_offset_cancellation(codec); |
1473 | 1473 | ||
1474 | regcache_cache_only(codec->control_data, false); | 1474 | regcache_cache_only(da732x->regmap, false); |
1475 | regcache_sync(codec->control_data); | 1475 | regcache_sync(da732x->regmap); |
1476 | } else { | 1476 | } else { |
1477 | snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, | 1477 | snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, |
1478 | DA732X_BIAS_BOOST_MASK, | 1478 | DA732X_BIAS_BOOST_MASK, |
@@ -1483,7 +1483,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, | |||
1483 | } | 1483 | } |
1484 | break; | 1484 | break; |
1485 | case SND_SOC_BIAS_OFF: | 1485 | case SND_SOC_BIAS_OFF: |
1486 | regcache_cache_only(codec->control_data, true); | 1486 | regcache_cache_only(da732x->regmap, true); |
1487 | da732x_set_charge_pump(codec, DA732X_DISABLE_CP); | 1487 | da732x_set_charge_pump(codec, DA732X_DISABLE_CP); |
1488 | snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_EN, | 1488 | snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_EN, |
1489 | DA732X_BIAS_DIS); | 1489 | DA732X_BIAS_DIS); |