adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: Switch palm27x-asoc to jack detection api

Browse source 
This patch removes the old method of jack detection from palm27x-asoc
driver and adds jack detection api. It also removes some other (now)
useless stuff from the driver and corrects pin configuration for the
codec.

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 2009-07-23 22:16:56 +02:00 committed by Mark Brown
parent 178b699c25
commit 4ce2f2fe61
1 changed files with 77 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

210
sound/soc/pxa/palm27x.c
View file

@ -17,13 +17,12 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <sound/jack.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/audio.h> #include <mach/audio.h>
@ -33,90 +32,31 @@
#include "pxa2xx-pcm.h" #include "pxa2xx-pcm.h"
#include "pxa2xx-ac97.h" #include "pxa2xx-ac97.h"
static int palm27x_jack_func = 1; static struct snd_soc_jack hs_jack;
static int palm27x_spk_func = 1;
static int palm27x_ep_gpio = -1;
static void palm27x_ext_control(struct snd_soc_codec *codec) /* Headphones jack detection DAPM pins */
static struct snd_soc_jack_pin hs_jack_pins[] = {
{ {
if (!palm27x_spk_func) .pin = "Headphone Jack",
snd_soc_dapm_enable_pin(codec, "Speaker"); .mask = SND_JACK_HEADPHONE,
else },
snd_soc_dapm_disable_pin(codec, "Speaker");
if (!palm27x_jack_func)
snd_soc_dapm_enable_pin(codec, "Headphone Jack");
else
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_sync(codec);
}
static int palm27x_startup(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_codec *codec = rtd->socdev->card->codec;
/* check the jack status at stream startup */
palm27x_ext_control(codec);
return 0;
}
static struct snd_soc_ops palm27x_ops = {
.startup = palm27x_startup,
}; };
static irqreturn_t palm27x_interrupt(int irq, void *v) /* Headphones jack detection gpios */
{ static struct snd_soc_jack_gpio hs_jack_gpios[] = {
palm27x_spk_func = gpio_get_value(palm27x_ep_gpio); [0] = {
palm27x_jack_func = !palm27x_spk_func; /* gpio is set on per-platform basis */
return IRQ_HANDLED; .name = "hp-gpio",
} .report = SND_JACK_HEADPHONE,
.debounce_time = 200,
},
};
static int palm27x_get_jack(struct snd_kcontrol *kcontrol, /* Palm27x machine dapm widgets */
struct snd_ctl_elem_value *ucontrol)
{
ucontrol->value.integer.value[0] = palm27x_jack_func;
return 0;
}
static int palm27x_set_jack(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
if (palm27x_jack_func == ucontrol->value.integer.value[0])
return 0;
palm27x_jack_func = ucontrol->value.integer.value[0];
palm27x_ext_control(codec);
return 1;
}
static int palm27x_get_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
ucontrol->value.integer.value[0] = palm27x_spk_func;
return 0;
}
static int palm27x_set_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
if (palm27x_spk_func == ucontrol->value.integer.value[0])
return 0;
palm27x_spk_func = ucontrol->value.integer.value[0];
palm27x_ext_control(codec);
return 1;
}
/* PalmTX machine dapm widgets */
static const struct snd_soc_dapm_widget palm27x_dapm_widgets[] = { static const struct snd_soc_dapm_widget palm27x_dapm_widgets[] = {
SND_SOC_DAPM_HP("Headphone Jack", NULL), SND_SOC_DAPM_HP("Headphone Jack", NULL),
SND_SOC_DAPM_SPK("Speaker", NULL), SND_SOC_DAPM_SPK("Ext. Speaker", NULL),
SND_SOC_DAPM_MIC("Ext. Microphone", NULL),
}; };
/* PalmTX audio map */ /* PalmTX audio map */
@ -126,46 +66,66 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"Headphone Jack", NULL, "HPOUTR"}, {"Headphone Jack", NULL, "HPOUTR"},
/* ext speaker connected to ROUT2, LOUT2 */ /* ext speaker connected to ROUT2, LOUT2 */
{"Speaker", NULL, "LOUT2"}, {"Ext. Speaker", NULL, "LOUT2"},
{"Speaker", NULL, "ROUT2"}, {"Ext. Speaker", NULL, "ROUT2"},
/* mic connected to MIC1 */
{"Ext. Microphone", NULL, "MIC1"},
}; };
static const char *jack_function[] = {"Headphone", "Off"}; static struct snd_soc_card palm27x_asoc;
static const char *spk_function[] = {"On", "Off"};
static const struct soc_enum palm27x_enum[] = {
SOC_ENUM_SINGLE_EXT(2, jack_function),
SOC_ENUM_SINGLE_EXT(2, spk_function),
};
static const struct snd_kcontrol_new palm27x_controls[] = {
SOC_ENUM_EXT("Jack Function", palm27x_enum[0], palm27x_get_jack,
palm27x_set_jack),
SOC_ENUM_EXT("Speaker Function", palm27x_enum[1], palm27x_get_spk,
palm27x_set_spk),
};
static int palm27x_ac97_init(struct snd_soc_codec *codec) static int palm27x_ac97_init(struct snd_soc_codec *codec)
{ {
int err; int err;
snd_soc_dapm_nc_pin(codec, "OUT3"); /* add palm27x specific widgets */
snd_soc_dapm_nc_pin(codec, "MONOOUT"); err = snd_soc_dapm_new_controls(codec, palm27x_dapm_widgets,
ARRAY_SIZE(palm27x_dapm_widgets));
/* add palm27x specific controls */ if (err)
err = snd_soc_add_controls(codec, palm27x_controls,
ARRAY_SIZE(palm27x_controls));
if (err < 0)
return err; return err;
/* add palm27x specific widgets */
snd_soc_dapm_new_controls(codec, palm27x_dapm_widgets,
ARRAY_SIZE(palm27x_dapm_widgets));
/* set up palm27x specific audio path audio_map */ /* set up palm27x specific audio path audio_map */
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); err = snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
if (err)
return err;
snd_soc_dapm_sync(codec); /* connected pins */
return 0; if (machine_is_palmld())
snd_soc_dapm_enable_pin(codec, "MIC1");
snd_soc_dapm_enable_pin(codec, "HPOUTL");
snd_soc_dapm_enable_pin(codec, "HPOUTR");
snd_soc_dapm_enable_pin(codec, "LOUT2");
snd_soc_dapm_enable_pin(codec, "ROUT2");
/* not connected pins */
snd_soc_dapm_nc_pin(codec, "OUT3");
snd_soc_dapm_nc_pin(codec, "MONOOUT");
snd_soc_dapm_nc_pin(codec, "LINEINL");
snd_soc_dapm_nc_pin(codec, "LINEINR");
snd_soc_dapm_nc_pin(codec, "PCBEEP");
snd_soc_dapm_nc_pin(codec, "PHONE");
snd_soc_dapm_nc_pin(codec, "MIC2");
err = snd_soc_dapm_sync(codec);
if (err)
return err;
/* Jack detection API stuff */
err = snd_soc_jack_new(&palm27x_asoc, "Headphone Jack",
SND_JACK_HEADPHONE, &hs_jack);
if (err)
return err;
err = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
hs_jack_pins);
if (err)
return err;
err = snd_soc_jack_add_gpios(&hs_jack, ARRAY_SIZE(hs_jack_gpios),
hs_jack_gpios);
return err;
} }
static struct snd_soc_dai_link palm27x_dai[] = { static struct snd_soc_dai_link palm27x_dai[] = {
@ -175,14 +135,12 @@ static struct snd_soc_dai_link palm27x_dai[] = {
.cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI], .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_HIFI],
.codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI], .codec_dai = &wm9712_dai[WM9712_DAI_AC97_HIFI],
.init = palm27x_ac97_init, .init = palm27x_ac97_init,
.ops = &palm27x_ops,
}, },
{ {
.name = "AC97 Aux", .name = "AC97 Aux",
.stream_name = "AC97 Aux", .stream_name = "AC97 Aux",
.cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX], .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX],
.codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX], .codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX],
.ops = &palm27x_ops,
}, },
}; };
@ -208,27 +166,17 @@ static int palm27x_asoc_probe(struct platform_device *pdev)
machine_is_palmld() || machine_is_palmte2())) machine_is_palmld() || machine_is_palmte2()))
return -ENODEV; return -ENODEV;
if (pdev->dev.platform_data) if (!pdev->dev.platform_data) {
palm27x_ep_gpio = ((struct palm27x_asoc_info *) dev_err(&pdev->dev, "please supply platform_data\n");
return -ENODEV;
}
hs_jack_gpios[0].gpio = ((struct palm27x_asoc_info *)
(pdev->dev.platform_data))->jack_gpio; (pdev->dev.platform_data))->jack_gpio;
ret = gpio_request(palm27x_ep_gpio, "Headphone Jack");
if (ret)
return ret;
ret = gpio_direction_input(palm27x_ep_gpio);
if (ret)
goto err_alloc;
if (request_irq(gpio_to_irq(palm27x_ep_gpio), palm27x_interrupt,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"Headphone jack", NULL))
goto err_alloc;
palm27x_snd_device = platform_device_alloc("soc-audio", -1); palm27x_snd_device = platform_device_alloc("soc-audio", -1);
if (!palm27x_snd_device) { if (!palm27x_snd_device)
ret = -ENOMEM; return -ENOMEM;
goto err_dev;
}
platform_set_drvdata(palm27x_snd_device, &palm27x_snd_devdata); platform_set_drvdata(palm27x_snd_device, &palm27x_snd_devdata);
palm27x_snd_devdata.dev = &palm27x_snd_device->dev; palm27x_snd_devdata.dev = &palm27x_snd_device->dev;
@ -241,18 +189,12 @@ static int palm27x_asoc_probe(struct platform_device *pdev)
put_device: put_device:
platform_device_put(palm27x_snd_device); platform_device_put(palm27x_snd_device);
err_dev:
free_irq(gpio_to_irq(palm27x_ep_gpio), NULL);
err_alloc:
gpio_free(palm27x_ep_gpio);
return ret; return ret;
} }
static int __devexit palm27x_asoc_remove(struct platform_device *pdev) static int __devexit palm27x_asoc_remove(struct platform_device *pdev)
{ {
free_irq(gpio_to_irq(palm27x_ep_gpio), NULL);
gpio_free(palm27x_ep_gpio);
platform_device_unregister(palm27x_snd_device); platform_device_unregister(palm27x_snd_device);
return 0; return 0;
} }