* [PATCH 1/2] ASoC: sdp4430: Enable FM stereo pins
@ 2010-12-06 22:34 Olaya, Margarita
2010-12-06 22:47 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Olaya, Margarita @ 2010-12-06 22:34 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: alsa-devel@alsa-project.org
From: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Add FM stereo pins to the machine driver and add them as a
dapm widget.
Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
---
sound/soc/omap/sdp4430.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index ebbd62f..0c37c51 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -101,6 +101,7 @@ static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = {
SND_SOC_DAPM_MIC("Headset Mic", NULL),
SND_SOC_DAPM_HP("Headset Stereophone", NULL),
SND_SOC_DAPM_SPK("Earphone Spk", NULL),
+ SND_SOC_DAPM_INPUT("Aux/FM Stereo In"),
};
static const struct snd_soc_dapm_route audio_map[] = {
@@ -123,6 +124,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
/* Earphone speaker */
{"Earphone Spk", NULL, "EP"},
+
+ /* Aux/FM Stereo In: AFML, AFMR */
+ {"AFML", NULL, "Aux/FM Stereo In"},
+ {"AFMR", NULL, "Aux/FM Stereo In"},
};
static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
@@ -149,13 +154,11 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
/* SDP4430 connected pins */
snd_soc_dapm_enable_pin(dapm, "Ext Mic");
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+ snd_soc_dapm_enable_pin(dapm, "AFML");
+ snd_soc_dapm_enable_pin(dapm, "AFMR");
snd_soc_dapm_enable_pin(dapm, "Headset Mic");
snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
- /* TWL6040 not connected pins */
- snd_soc_dapm_nc_pin(dapm, "AFML");
- snd_soc_dapm_nc_pin(dapm, "AFMR");
-
ret = snd_soc_dapm_sync(dapm);
return ret;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] ASoC: sdp4430: Enable FM stereo pins
2010-12-06 22:34 [PATCH 1/2] ASoC: sdp4430: Enable FM stereo pins Olaya, Margarita
@ 2010-12-06 22:47 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2010-12-06 22:47 UTC (permalink / raw)
To: Olaya, Margarita; +Cc: alsa-devel@alsa-project.org, Liam Girdwood
On Mon, Dec 06, 2010 at 04:34:51PM -0600, Olaya, Margarita wrote:
> From: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
>
> Add FM stereo pins to the machine driver and add them as a
> dapm widget.
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-06 22:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-06 22:34 [PATCH 1/2] ASoC: sdp4430: Enable FM stereo pins Olaya, Margarita
2010-12-06 22:47 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.