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

ASoC: Tegra+ALC5632: Enable headset autodetection on PAZ00 board.

Browse Source 
This patch is adding device tree support of headset autodetection on PAZ00 board.

Signed-off-by: Leon Romanovsky <leon@leon.nu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Leon Romanovsky 2012-02-02 22:13:37 +02:00 committed by Mark Brown
parent 25bfe662e8
commit d559f1e5ad
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sound/soc/tegra/tegra_alc5632.c
View File

@ -18,6 +18,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/jack.h> #include <sound/jack.h>
@ -34,9 +35,13 @@
#define DRV_NAME "tegra-alc5632" #define DRV_NAME "tegra-alc5632"
#define GPIO_HP_DET BIT(0)
struct tegra_alc5632 { struct tegra_alc5632 {
struct tegra_asoc_utils_data util_data; struct tegra_asoc_utils_data util_data;
struct platform_device *pcm_dev; struct platform_device *pcm_dev;
int gpio_requested;
int gpio_hp_det;
}; };
static int tegra_alc5632_asoc_hw_params(struct snd_pcm_substream *substream, static int tegra_alc5632_asoc_hw_params(struct snd_pcm_substream *substream,
@ -86,6 +91,13 @@ static struct snd_soc_jack_pin tegra_alc5632_hs_jack_pins[] = {
}, },
}; };
static struct snd_soc_jack_gpio tegra_alc5632_hp_jack_gpio = {
.name = "Headset detection",
.report = SND_JACK_HEADSET,
.debounce_time = 150,
.invert = 1,
};
static const struct snd_soc_dapm_widget tegra_alc5632_dapm_widgets[] = { static const struct snd_soc_dapm_widget tegra_alc5632_dapm_widgets[] = {
SND_SOC_DAPM_SPK("Int Spk", NULL), SND_SOC_DAPM_SPK("Int Spk", NULL),
SND_SOC_DAPM_HP("Headset Stereophone", NULL), SND_SOC_DAPM_HP("Headset Stereophone", NULL),
@ -114,6 +126,9 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_dapm_context *dapm = &codec->dapm;
struct device_node *np = codec->card->dev->of_node;
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card);
int ret;
snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
&tegra_alc5632_hs_jack); &tegra_alc5632_hs_jack);
@ -121,6 +136,16 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
ARRAY_SIZE(tegra_alc5632_hs_jack_pins), ARRAY_SIZE(tegra_alc5632_hs_jack_pins),
tegra_alc5632_hs_jack_pins); tegra_alc5632_hs_jack_pins);
machine->gpio_hp_det = of_get_named_gpio(np, "nvidia,hp-det-gpios", 0);
if (gpio_is_valid(machine->gpio_hp_det)) {
tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;
snd_soc_jack_add_gpios(&tegra_alc5632_hs_jack,
1,
&tegra_alc5632_hp_jack_gpio);
machine->gpio_requested |= GPIO_HP_DET;
}
snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
return 0; return 0;
@ -239,13 +264,19 @@ err:
static int __devexit tegra_alc5632_remove(struct platform_device *pdev) static int __devexit tegra_alc5632_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_alc5632 *alc5632 = snd_soc_card_get_drvdata(card); struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);
if (machine->gpio_requested & GPIO_HP_DET)
snd_soc_jack_free_gpios(&tegra_alc5632_hs_jack,
1,
&tegra_alc5632_hp_jack_gpio);
machine->gpio_requested = 0;
snd_soc_unregister_card(card); snd_soc_unregister_card(card);
tegra_asoc_utils_fini(&alc5632->util_data); tegra_asoc_utils_fini(&machine->util_data);
if (!IS_ERR(alc5632->pcm_dev)) if (!IS_ERR(machine->pcm_dev))
platform_device_unregister(alc5632->pcm_dev); platform_device_unregister(machine->pcm_dev);
return 0; return 0;
} }