ASoC: sdp4430: Enable FM stereo pins
Jorge Eduardo Candelaria [Wed, 8 Dec 2010 16:55:05 +0000 (10:55 -0600)]
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>

sound/soc/omap/sdp4430.c

index ebbd62f..0c37c51 100644 (file)
@@ -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;