Skip to content

Commit

Permalink
ASoC: sdp4430: Enable FM stereo pins
Browse files Browse the repository at this point in the history
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>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Jorge Eduardo Candelaria authored and Liam Girdwood committed Dec 9, 2010
1 parent 3ee4fe1 commit 23ac3b6
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions sound/soc/omap/sdp4430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand All @@ -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)
Expand All @@ -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;
Expand Down

0 comments on commit 23ac3b6

Please sign in to comment.