Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 23ac3b61331137355064d8b22a3624fe1cd8527a

Authored by Jorge Eduardo Candelaria
Committed by Liam Girdwood
1 parent 3ee4fe15ab

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>

Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff

sound/soc/omap/sdp4430.c
Diff comments   View file @ 23ac3b6
... ... @@ -101,6 +101,7 @@
101 101 SND_SOC_DAPM_MIC("Headset Mic", NULL),
102 102 SND_SOC_DAPM_HP("Headset Stereophone", NULL),
103 103 SND_SOC_DAPM_SPK("Earphone Spk", NULL),
  104 + SND_SOC_DAPM_INPUT("Aux/FM Stereo In"),
104 105 };
105 106  
106 107 static const struct snd_soc_dapm_route audio_map[] = {
... ... @@ -123,6 +124,10 @@
123 124  
124 125 /* Earphone speaker */
125 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  
128 133 static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
129 134  
... ... @@ -149,12 +154,10 @@
149 154 /* SDP4430 connected pins */
150 155 snd_soc_dapm_enable_pin(dapm, "Ext Mic");
151 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 159 snd_soc_dapm_enable_pin(dapm, "Headset Mic");
153 160 snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
154   -
155   - /* TWL6040 not connected pins */
156   - snd_soc_dapm_nc_pin(dapm, "AFML");
157   - snd_soc_dapm_nc_pin(dapm, "AFMR");
158 161  
159 162 ret = snd_soc_dapm_sync(dapm);
160 163