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

Commit 0049317e authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Ensure sane WM835x AIF configuration by default 



Ensure that whatever ran before us leaves the WM835x with a sane default
audio interface configuration as we do not override the companding,
loopback or tristate settings and do not reset the chip at startup (as it
is a PMIC).

Reported-by: default avatarKeiji Mitsuhisa <Keiji.Mitsuhisa@wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent c28a9926

sound/soc/codecs/wm8350.c

+7 −0
Original line number Diff line number Diff line
@@ -1586,6 +1586,13 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) 
	wm8350_set_bits(wm8350, WM8350_ROUT2_VOLUME,

			WM8350_OUT2_VU | WM8350_OUT2R_MUTE);



	/* Make sure AIF tristating is disabled by default */

	wm8350_clear_bits(wm8350, WM8350_AI_FORMATING, WM8350_AIF_TRI);



	/* Make sure we've got a sane companding setup too */

	wm8350_clear_bits(wm8350, WM8350_ADC_DAC_COMP,

			  WM8350_DAC_COMP | WM8350_LOOPBACK);



	/* Make sure jack detect is disabled to start off with */

	wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,

			  WM8350_JDL_ENA | WM8350_JDR_ENA);