Commit 48529b3b authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Liam Girdwood

ASoC: omap: rx51: Add stereo output support to audio jack

Audio jack in Nokia RX-51/N900 is driven by TPA6130 headphone amplifier.
This patch adds support for it and stereo output can be active when
"Jack Function" == "TV-OUT" || "Headphone".

As the TPA6130 can output very high volume levels the output is limited
with snd_soc_limit_volume. Limiting value is found from Maemo kernel sources.
Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 64ed9836
...@@ -24,6 +24,7 @@ config SND_OMAP_SOC_RX51 ...@@ -24,6 +24,7 @@ config SND_OMAP_SOC_RX51
select OMAP_MCBSP select OMAP_MCBSP
select SND_OMAP_SOC_MCBSP select SND_OMAP_SOC_MCBSP
select SND_SOC_TLV320AIC3X select SND_SOC_TLV320AIC3X
select SND_SOC_TPA6130A2
help help
Say Y if you want to add support for SoC audio on Nokia RX-51 Say Y if you want to add support for SoC audio on Nokia RX-51
hardware. This is also known as Nokia N900 product. hardware. This is also known as Nokia N900 product.
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <plat/mcbsp.h> #include <plat/mcbsp.h>
#include "../codecs/tpa6130a2.h"
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -47,7 +48,8 @@ ...@@ -47,7 +48,8 @@
enum { enum {
RX51_JACK_DISABLED, RX51_JACK_DISABLED,
RX51_JACK_TVOUT, /* tv-out */ RX51_JACK_TVOUT, /* tv-out with stereo output */
RX51_JACK_HP, /* headphone: stereo output, no mic */
}; };
static int rx51_spk_func; static int rx51_spk_func;
...@@ -57,6 +59,15 @@ static int rx51_jack_func; ...@@ -57,6 +59,15 @@ static int rx51_jack_func;
static void rx51_ext_control(struct snd_soc_codec *codec) static void rx51_ext_control(struct snd_soc_codec *codec)
{ {
struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_dapm_context *dapm = &codec->dapm;
int hp = 0, tvout = 0;
switch (rx51_jack_func) {
case RX51_JACK_TVOUT:
tvout = 1;
case RX51_JACK_HP:
hp = 1;
break;
}
if (rx51_spk_func) if (rx51_spk_func)
snd_soc_dapm_enable_pin(dapm, "Ext Spk"); snd_soc_dapm_enable_pin(dapm, "Ext Spk");
...@@ -66,9 +77,12 @@ static void rx51_ext_control(struct snd_soc_codec *codec) ...@@ -66,9 +77,12 @@ static void rx51_ext_control(struct snd_soc_codec *codec)
snd_soc_dapm_enable_pin(dapm, "DMic"); snd_soc_dapm_enable_pin(dapm, "DMic");
else else
snd_soc_dapm_disable_pin(dapm, "DMic"); snd_soc_dapm_disable_pin(dapm, "DMic");
if (hp)
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
else
snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
gpio_set_value(RX51_TVOUT_SEL_GPIO, gpio_set_value(RX51_TVOUT_SEL_GPIO, tvout);
rx51_jack_func == RX51_JACK_TVOUT);
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
} }
...@@ -153,6 +167,19 @@ static int rx51_spk_event(struct snd_soc_dapm_widget *w, ...@@ -153,6 +167,19 @@ static int rx51_spk_event(struct snd_soc_dapm_widget *w,
return 0; return 0;
} }
static int rx51_hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event)
{
struct snd_soc_codec *codec = w->dapm->codec;
if (SND_SOC_DAPM_EVENT_ON(event))
tpa6130a2_stereo_enable(codec, 1);
else
tpa6130a2_stereo_enable(codec, 0);
return 0;
}
static int rx51_get_input(struct snd_kcontrol *kcontrol, static int rx51_get_input(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
...@@ -212,11 +239,14 @@ static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = { ...@@ -212,11 +239,14 @@ static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = {
static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = { static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = {
SND_SOC_DAPM_SPK("Ext Spk", rx51_spk_event), SND_SOC_DAPM_SPK("Ext Spk", rx51_spk_event),
SND_SOC_DAPM_MIC("DMic", NULL), SND_SOC_DAPM_MIC("DMic", NULL),
SND_SOC_DAPM_HP("Headphone Jack", rx51_hp_event),
}; };
static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map[] = {
{"Ext Spk", NULL, "HPLOUT"}, {"Ext Spk", NULL, "HPLOUT"},
{"Ext Spk", NULL, "HPROUT"}, {"Ext Spk", NULL, "HPROUT"},
{"Headphone Jack", NULL, "LLOUT"},
{"Headphone Jack", NULL, "RLOUT"},
{"DMic Rate 64", NULL, "Mic Bias 2V"}, {"DMic Rate 64", NULL, "Mic Bias 2V"},
{"Mic Bias 2V", NULL, "DMic"}, {"Mic Bias 2V", NULL, "DMic"},
...@@ -224,7 +254,7 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -224,7 +254,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
static const char *spk_function[] = {"Off", "On"}; static const char *spk_function[] = {"Off", "On"};
static const char *input_function[] = {"ADC", "Digital Mic"}; static const char *input_function[] = {"ADC", "Digital Mic"};
static const char *jack_function[] = {"Off", "TV-OUT"}; static const char *jack_function[] = {"Off", "TV-OUT", "Headphone"};
static const struct soc_enum rx51_enum[] = { static const struct soc_enum rx51_enum[] = {
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function), SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
...@@ -265,6 +295,11 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) ...@@ -265,6 +295,11 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
/* Set up RX-51 specific audio path audio_map */ /* Set up RX-51 specific audio path audio_map */
snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
err = tpa6130a2_add_controls(codec);
if (err < 0)
return err;
snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
/* AV jack detection */ /* AV jack detection */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment