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

Commit 433897f7 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm8904: Fix GPIO and MICBIAS initialisation for regmap conversion 



We no longer have a flat ASoC cache so can't peer directly into the array
any more but should instead use the register I/O functions to update the
cache.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org (v3.4)
parent 972a55b6

sound/soc/codecs/wm8904.c

+8 −5
Original line number Diff line number Diff line
@@ -2084,7 +2084,6 @@ static int wm8904_probe(struct snd_soc_codec *codec) 
{

	struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);

	struct wm8904_pdata *pdata = wm8904->pdata;

	u16 *reg_cache = codec->reg_cache;

	int ret, i;



	codec->cache_sync = 1;
@@ -2180,14 +2179,18 @@ static int wm8904_probe(struct snd_soc_codec *codec) 
			if (!pdata->gpio_cfg[i])

				continue;



			reg_cache[WM8904_GPIO_CONTROL_1 + i]

				= pdata->gpio_cfg[i] & 0xffff;

			regmap_update_bits(wm8904->regmap,

					   WM8904_GPIO_CONTROL_1 + i,

					   0xffff,

					   pdata->gpio_cfg[i]);

		}



		/* Zero is the default value for these anyway */

		for (i = 0; i < WM8904_MIC_REGS; i++)

			reg_cache[WM8904_MIC_BIAS_CONTROL_0 + i]

				= pdata->mic_cfg[i];

			regmap_update_bits(wm8904->regmap,

					   WM8904_MIC_BIAS_CONTROL_0 + i,

					   0xffff,

					   pdata->mic_cfg[i]);

	}



	/* Set Class W by default - this will be managed by the Class