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

Commit b66a70d5 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Sync initial widget state with hardware 



ASoC generally uses the register defaults for everything, but in some
cases the hardware will default to enabling some of the DAPM widgets
(clocks for example). Ensure that DAPM knows about the actual widget
state at initialisation by reading the enable bits after instantiating
the widgets so they don't get left enabled needlessly.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 6ed8f148

sound/soc/soc-dapm.c

+13 −0
Original line number Diff line number Diff line
@@ -1627,6 +1627,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_add_routes); 
int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)

{

	struct snd_soc_dapm_widget *w;

	unsigned int val;



	list_for_each_entry(w, &dapm->card->widgets, list)

	{
@@ -1675,6 +1676,18 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) 
		case snd_soc_dapm_post:

			break;

		}



		/* Read the initial power state from the device */

		if (w->reg >= 0) {

			val = snd_soc_read(w->codec, w->reg);

			val &= 1 << w->shift;

			if (w->invert)

				val = !val;



			if (val)

				w->power = 1;

		}



		w->new = 1;

	}