aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJorge Eduardo Candelaria <jorge.candelaria@ti.com>2010-12-08 11:55:05 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-12-09 04:46:05 -0500
commit23ac3b61331137355064d8b22a3624fe1cd8527a (patch)
tree59cd7c21d5b57a6685e11a5039153b51c4bec314 /sound
parent3ee4fe15aba7531f75be4dcc331caa8f0c6369ec (diff)
ASoC: sdp4430: Enable FM stereo pins
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/sdp4430.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index ebbd62fc447c..0c37c51313a8 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[] = {
101 SND_SOC_DAPM_MIC("Headset Mic", NULL), 101 SND_SOC_DAPM_MIC("Headset Mic", NULL),
102 SND_SOC_DAPM_HP("Headset Stereophone", NULL), 102 SND_SOC_DAPM_HP("Headset Stereophone", NULL),
103 SND_SOC_DAPM_SPK("Earphone Spk", NULL), 103 SND_SOC_DAPM_SPK("Earphone Spk", NULL),
104 SND_SOC_DAPM_INPUT("Aux/FM Stereo In"),
104}; 105};
105 106
106static const struct snd_soc_dapm_route audio_map[] = { 107static const struct snd_soc_dapm_route audio_map[] = {
@@ -123,6 +124,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
123 124
124 /* Earphone speaker */ 125 /* Earphone speaker */
125 {"Earphone Spk", NULL, "EP"}, 126 {"Earphone Spk", NULL, "EP"},
127
128 /* Aux/FM Stereo In: AFML, AFMR */
129 {"AFML", NULL, "Aux/FM Stereo In"},
130 {"AFMR", NULL, "Aux/FM Stereo In"},
126}; 131};
127 132
128static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd) 133static 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)
149 /* SDP4430 connected pins */ 154 /* SDP4430 connected pins */
150 snd_soc_dapm_enable_pin(dapm, "Ext Mic"); 155 snd_soc_dapm_enable_pin(dapm, "Ext Mic");
151 snd_soc_dapm_enable_pin(dapm, "Ext Spk"); 156 snd_soc_dapm_enable_pin(dapm, "Ext Spk");
157 snd_soc_dapm_enable_pin(dapm, "AFML");
158 snd_soc_dapm_enable_pin(dapm, "AFMR");
152 snd_soc_dapm_enable_pin(dapm, "Headset Mic"); 159 snd_soc_dapm_enable_pin(dapm, "Headset Mic");
153 snd_soc_dapm_enable_pin(dapm, "Headset Stereophone"); 160 snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
154 161
155 /* TWL6040 not connected pins */
156 snd_soc_dapm_nc_pin(dapm, "AFML");
157 snd_soc_dapm_nc_pin(dapm, "AFMR");
158
159 ret = snd_soc_dapm_sync(dapm); 162 ret = snd_soc_dapm_sync(dapm);
160 163
161 return ret; 164 return ret;