diff options
| author | Jorge Eduardo Candelaria <jorge.candelaria@ti.com> | 2010-05-28 13:04:25 -0500 |
|---|---|---|
| committer | Jorge Eduardo Candelaria <jorge.candelaria@ti.com> | 2010-06-17 18:27:05 -0500 |
| commit | 9ce5a18b2dbe3bbf252ce26ba20db1e261219ca0 (patch) | |
| tree | 65d9131053a543977f25933e7922faea7c6ccd2a | |
| parent | 99d81f85b0dec00009a8a433759d16c7cab2c634 (diff) | |
ASoC: SDP4430: Add Aux/FM input pins
| -rw-r--r-- | 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 0cf39a925226..fb2617726779 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c @@ -161,6 +161,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[] = { @@ -183,6 +184,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_codec *codec) @@ -207,13 +212,11 @@ static int sdp4430_twl6040_init(struct snd_soc_codec *codec) /* SDP4430 connected pins */ snd_soc_dapm_enable_pin(codec, "Ext Mic"); snd_soc_dapm_enable_pin(codec, "Ext Spk"); + snd_soc_dapm_enable_pin(codec, "AFML"); + snd_soc_dapm_enable_pin(codec, "AFMR"); snd_soc_dapm_disable_pin(codec, "Headset Mic"); snd_soc_dapm_disable_pin(codec, "Headset Stereophone"); - /* TWL6040 not connected pins */ - snd_soc_dapm_nc_pin(codec, "AFML"); - snd_soc_dapm_nc_pin(codec, "AFMR"); - ret = snd_soc_dapm_sync(codec); if (ret) return ret; |