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

Commit 04368d05 authored by Marek Vasut's avatar Marek Vasut Committed by Mark Brown
Browse files

ASoC: Properly handle spitz MIC GPIO 



This patch firstly restructurizes the code a bit by getting rid of continuous
checking for machine type in spitz_mic_bias().

Then the patch properly requests the MIC GPIO in the spitz_init() and frees it
in spitz_exit().

Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 363618f0

sound/soc/pxa/spitz.c

+29 −12
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


static int spitz_jack_func;

static int spitz_spk_func;

static int spitz_mic_gpio;



static void spitz_ext_control(struct snd_soc_codec *codec)

{
@@ -217,14 +218,7 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, 
static int spitz_mic_bias(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *k, int event)

{

	if (machine_is_borzoi() || machine_is_spitz())

		gpio_set_value(SPITZ_GPIO_MIC_BIAS,

				SND_SOC_DAPM_EVENT_ON(event));



	if (machine_is_akita())

		gpio_set_value(AKITA_GPIO_MIC_BIAS,

				SND_SOC_DAPM_EVENT_ON(event));



	gpio_set_value_cansleep(spitz_mic_gpio, SND_SOC_DAPM_EVENT_ON(event));

	return 0;

}
@@ -339,22 +333,45 @@ static int __init spitz_init(void) 
	if (!(machine_is_spitz() || machine_is_borzoi() || machine_is_akita()))

		return -ENODEV;



	if (machine_is_borzoi() || machine_is_spitz())

		spitz_mic_gpio = SPITZ_GPIO_MIC_BIAS;

	else

		spitz_mic_gpio = AKITA_GPIO_MIC_BIAS;



	ret = gpio_request(spitz_mic_gpio, "MIC GPIO");

	if (ret)

		goto err1;



	ret = gpio_direction_output(spitz_mic_gpio, 0);

	if (ret)

		goto err2;



	spitz_snd_device = platform_device_alloc("soc-audio", -1);

	if (!spitz_snd_device)

		return -ENOMEM;

	if (!spitz_snd_device) {

		ret = -ENOMEM;

		goto err2;

	}



	platform_set_drvdata(spitz_snd_device, &snd_soc_spitz);

	ret = platform_device_add(spitz_snd_device);



	ret = platform_device_add(spitz_snd_device);

	if (ret)

		platform_device_put(spitz_snd_device);

		goto err3;



	return 0;



err3:

	platform_device_put(spitz_snd_device);

err2:

	gpio_free(spitz_mic_gpio);

err1:

	return ret;

}



static void __exit spitz_exit(void)

{

	platform_device_unregister(spitz_snd_device);

	gpio_free(spitz_mic_gpio);

}



module_init(spitz_init);