Commit 1845a725 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: pxa: spitz: Update locking around use of DAPM pin API 



The pin updates in this driver look like they are intended to be done
atomically, update to do so.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent f71b0fbe

sound/soc/pxa/spitz.c

+28 −23
Original line number Diff line number Diff line
@@ -46,61 +46,66 @@ static int spitz_mic_gpio; 


static void spitz_ext_control(struct snd_soc_dapm_context *dapm)

{

	snd_soc_dapm_mutex_lock(dapm);



	if (spitz_spk_func == SPITZ_SPK_ON)

		snd_soc_dapm_enable_pin(dapm, "Ext Spk");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Ext Spk");

	else

		snd_soc_dapm_disable_pin(dapm, "Ext Spk");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Ext Spk");



	/* set up jack connection */

	switch (spitz_jack_func) {

	case SPITZ_HP:

		/* enable and unmute hp jack, disable mic bias */

		snd_soc_dapm_disable_pin(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin(dapm, "Line Jack");

		snd_soc_dapm_enable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone Jack");

		gpio_set_value(SPITZ_GPIO_MUTE_L, 1);

		gpio_set_value(SPITZ_GPIO_MUTE_R, 1);

		break;

	case SPITZ_MIC:

		/* enable mic jack and bias, mute hp */

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin(dapm, "Line Jack");

		snd_soc_dapm_enable_pin(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");

		gpio_set_value(SPITZ_GPIO_MUTE_L, 0);

		gpio_set_value(SPITZ_GPIO_MUTE_R, 0);

		break;

	case SPITZ_LINE:

		/* enable line jack, disable mic bias and mute hp */

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin(dapm, "Mic Jack");

		snd_soc_dapm_enable_pin(dapm, "Line Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Line Jack");

		gpio_set_value(SPITZ_GPIO_MUTE_L, 0);

		gpio_set_value(SPITZ_GPIO_MUTE_R, 0);

		break;

	case SPITZ_HEADSET:

		/* enable and unmute headset jack enable mic bias, mute L hp */

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_enable_pin(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin(dapm, "Line Jack");

		snd_soc_dapm_enable_pin(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");

		snd_soc_dapm_enable_pin_unlocked(dapm, "Headset Jack");

		gpio_set_value(SPITZ_GPIO_MUTE_L, 0);

		gpio_set_value(SPITZ_GPIO_MUTE_R, 1);

		break;

	case SPITZ_HP_OFF:



		/* jack removed, everything off */

		snd_soc_dapm_disable_pin(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin(dapm, "Line Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Jack");

		snd_soc_dapm_disable_pin_unlocked(dapm, "Line Jack");

		gpio_set_value(SPITZ_GPIO_MUTE_L, 0);

		gpio_set_value(SPITZ_GPIO_MUTE_R, 0);

		break;

	}

	snd_soc_dapm_sync(dapm);



	snd_soc_dapm_sync_unlocked(dapm);



	snd_soc_dapm_mutex_unlock(dapm);

}



static int spitz_startup(struct snd_pcm_substream *substream)