iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Properly handle spitz MIC GPIO

Browse Source 
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: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Marek Vasut 2011-04-02 03:43:15 +02:00 committed by Mark Brown
parent 363618f013
commit 04368d051a
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sound/soc/pxa/spitz.c
View File

@ -42,6 +42,7 @@
static int spitz_jack_func; static int spitz_jack_func;
static int spitz_spk_func; static int spitz_spk_func;
static int spitz_mic_gpio;
static void spitz_ext_control(struct snd_soc_codec *codec) 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, static int spitz_mic_bias(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event) struct snd_kcontrol *k, int event)
{ {
if (machine_is_borzoi() || machine_is_spitz()) gpio_set_value_cansleep(spitz_mic_gpio, SND_SOC_DAPM_EVENT_ON(event));
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));
return 0; return 0;
} }
@ -339,22 +333,45 @@ static int __init spitz_init(void)
if (!(machine_is_spitz() || machine_is_borzoi() || machine_is_akita())) if (!(machine_is_spitz() || machine_is_borzoi() || machine_is_akita()))
return -ENODEV; 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); spitz_snd_device = platform_device_alloc("soc-audio", -1);
if (!spitz_snd_device) if (!spitz_snd_device) {
return -ENOMEM; ret = -ENOMEM;
goto err2;
}
platform_set_drvdata(spitz_snd_device, &snd_soc_spitz); 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) 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; return ret;
} }
static void __exit spitz_exit(void) static void __exit spitz_exit(void)
{ {
platform_device_unregister(spitz_snd_device); platform_device_unregister(spitz_snd_device);
gpio_free(spitz_mic_gpio);
} }
module_init(spitz_init); module_init(spitz_init);