Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7c1b730 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 5cca5a91

sound/soc/codecs/wm8996.c

+4 −4
Original line number Diff line number Diff line
@@ -1608,8 +1608,8 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec, 
				msleep(5);

			}



			regcache_cache_only(codec->control_data, false);

			regcache_sync(codec->control_data);

			regcache_cache_only(wm8996->regmap, false);

			regcache_sync(wm8996->regmap);

		}



		/* Bypass the MICBIASes for lowest power */
@@ -1620,10 +1620,10 @@ static int wm8996_set_bias_level(struct snd_soc_codec *codec, 
		break;



	case SND_SOC_BIAS_OFF:

		regcache_cache_only(codec->control_data, true);

		regcache_cache_only(wm8996->regmap, true);

		if (wm8996->pdata.ldo_ena >= 0) {

			gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0);

			regcache_cache_only(codec->control_data, true);

			regcache_cache_only(wm8996->regmap, true);

		}

		regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies),

				       wm8996->supplies);