Commit b3208839 authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

ASoC: omap-abe-twl6040: Add complete DAPM routing 



SDP4430 is a reference platform, and as such it has all possible
audio routing implemented.
Correct the DAPM routing to be complete.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 778cee7a

sound/soc/omap/omap-abe-twl6040.c

+28 −18
Original line number Original line Diff line number Diff line
@@ -113,38 +113,48 @@ static struct snd_soc_jack_pin hs_jack_pins[] = { 




/* SDP4430 machine DAPM */

/* SDP4430 machine DAPM */

static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {

static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {

	SND_SOC_DAPM_MIC("Ext Mic", NULL),

	/* Outputs */

	SND_SOC_DAPM_SPK("Ext Spk", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_HP("Headset Stereophone", NULL),

	SND_SOC_DAPM_HP("Headset Stereophone", NULL),

	SND_SOC_DAPM_SPK("Earphone Spk", NULL),

	SND_SOC_DAPM_SPK("Earphone Spk", NULL),

	SND_SOC_DAPM_INPUT("FM Stereo In"),

	SND_SOC_DAPM_SPK("Ext Spk", NULL),

	SND_SOC_DAPM_LINE("Line Out", NULL),

	SND_SOC_DAPM_SPK("Vibrator", NULL),



	/* Inputs */

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_MIC("Main Handset Mic", NULL),

	SND_SOC_DAPM_MIC("Sub Handset Mic", NULL),

	SND_SOC_DAPM_LINE("Line In", NULL),

};

};





static const struct snd_soc_dapm_route audio_map[] = {

static const struct snd_soc_dapm_route audio_map[] = {

	/* External Mics: MAINMIC, SUBMIC with bias*/

	/* Routings for outputs */

	{"MAINMIC", NULL, "Ext Mic"},

	{"Headset Stereophone", NULL, "HSOL"},

	{"SUBMIC", NULL, "Ext Mic"},

	{"Headset Stereophone", NULL, "HSOR"},

	{"Ext Mic", NULL, "Main Mic Bias"},



	{"Earphone Spk", NULL, "EP"},





	/* External Speakers: HFL, HFR */

	{"Ext Spk", NULL, "HFL"},

	{"Ext Spk", NULL, "HFL"},

	{"Ext Spk", NULL, "HFR"},

	{"Ext Spk", NULL, "HFR"},





	/* Headset Mic: HSMIC with bias */

	{"Line Out", NULL, "AUXL"},

	{"Line Out", NULL, "AUXR"},



	{"Vibrator", NULL, "VIBRAL"},

	{"Vibrator", NULL, "VIBRAR"},



	/* Routings for inputs */

	{"HSMIC", NULL, "Headset Mic"},

	{"HSMIC", NULL, "Headset Mic"},

	{"Headset Mic", NULL, "Headset Mic Bias"},

	{"Headset Mic", NULL, "Headset Mic Bias"},





	/* Headset Stereophone (Headphone): HSOL, HSOR */

	{"MAINMIC", NULL, "Main Handset Mic"},

	{"Headset Stereophone", NULL, "HSOL"},

	{"Main Handset Mic", NULL, "Main Mic Bias"},

	{"Headset Stereophone", NULL, "HSOR"},





	/* Earphone speaker */

	{"SUBMIC", NULL, "Sub Handset Mic"},

	{"Earphone Spk", NULL, "EP"},

	{"Sub Handset Mic", NULL, "Main Mic Bias"},





	/* Aux/FM Stereo In: AFML, AFMR */

	{"AFML", NULL, "Line In"},

	{"AFML", NULL, "FM Stereo In"},

	{"AFMR", NULL, "Line In"},

	{"AFMR", NULL, "FM Stereo In"},

};

};





static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)

static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)

CRA Git | Maintained and supported by SUSTech CRA and CCSE