Commit 25c77c5f authored Oct 08, 2011 by Mark Brown

ASoC: Fix DAPM sync for TLV320AIC3x custom DAPM widget



We really should be doing this in the core, not in a driver...

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>

parent 3ebb5c9b

include/sound/soc-dapm.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -381,6 +381,9 @@ int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,
		int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
		const char *pin);

		/* Mostly internal - should not normally be used */
		void dapm_mark_dirty(struct snd_soc_dapm_widget w, const char reason);

		/* dapm widget types */
		enum snd_soc_dapm_type {
		snd_soc_dapm_input = 0, /* input pin */

sound/soc/codecs/tlv320aic3x.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -197,6 +197,10 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
		else
		/* old connection must be powered down */
		path->connect = invert ? 1 : 0;

		dapm_mark_dirty(path->source, "tlv320aic3x source");
		dapm_mark_dirty(path->sink, "tlv320aic3x sink");

		break;
		}

sound/soc/soc-dapm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ static bool dapm_dirty_widget(struct snd_soc_dapm_widget *w)
		return !list_empty(&w->dirty);
		}

		static void dapm_mark_dirty(struct snd_soc_dapm_widget w, const char reason)
		void dapm_mark_dirty(struct snd_soc_dapm_widget w, const char reason)
		{
		if (!dapm_dirty_widget(w)) {
		dev_vdbg(w->dapm->dev, "Marking %s dirty due to %s\n",
		@@ -132,6 +132,7 @@ static void dapm_mark_dirty(struct snd_soc_dapm_widget w, const char reason)
		list_add_tail(&w->dirty, &w->dapm->card->dapm_dirty);
		}
		}
		EXPORT_SYMBOL_GPL(dapm_mark_dirty);

		/* create a new dapm widget */
		static inline struct snd_soc_dapm_widget *dapm_cnew_widget(