diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-02-22 12:32:04 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-24 23:35:19 -0500 |
commit | b7c1b73097b48a7922d1320d5a8c8315ff4fae71 (patch) | |
tree | aee9c1f8e19c6a12431f793e73c69cb80c9e59a8 /sound/soc/codecs | |
parent | 5cca5a916f7ade910e2996e3b44ddffee8e08caf (diff) |
ASoC: wm8996: Replace codec->control_data with wm8996->regmap
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 wm8996 driver for this by using
wm8996->regmap instead of accessing the CODEC's control_data field.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/wm8996.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 92bb02185c46..36a52b9e97e7 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c | |||
@@ -1608,8 +1608,8 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec, | |||
1608 | msleep(5); | 1608 | msleep(5); |
1609 | } | 1609 | } |
1610 | 1610 | ||
1611 | regcache_cache_only(codec->control_data, false); | 1611 | regcache_cache_only(wm8996->regmap, false); |
1612 | regcache_sync(codec->control_data); | 1612 | regcache_sync(wm8996->regmap); |
1613 | } | 1613 | } |
1614 | 1614 | ||
1615 | /* Bypass the MICBIASes for lowest power */ | 1615 | /* Bypass the MICBIASes for lowest power */ |
@@ -1620,10 +1620,10 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec, | |||
1620 | break; | 1620 | break; |
1621 | 1621 | ||
1622 | case SND_SOC_BIAS_OFF: | 1622 | case SND_SOC_BIAS_OFF: |
1623 | regcache_cache_only(codec->control_data, true); | 1623 | regcache_cache_only(wm8996->regmap, true); |
1624 | if (wm8996->pdata.ldo_ena >= 0) { | 1624 | if (wm8996->pdata.ldo_ena >= 0) { |
1625 | gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); | 1625 | gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); |
1626 | regcache_cache_only(codec->control_data, true); | 1626 | regcache_cache_only(wm8996->regmap, true); |
1627 | } | 1627 | } |
1628 | regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies), | 1628 | regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies), |
1629 | wm8996->supplies); | 1629 | wm8996->supplies); |