From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Liam Girdwood <lrg@ti.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Tony Lindgren <tony@atomide.com> Cc: Misael Lopez Cruz <misael.lopez@ti.com>, alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peter Ujfalusi <peter.ujfalusi@ti.com> Subject: [PATCH v3 5/9] ASoC: omap-abe-twl6040: Add complete DAPM routing Date: Thu, 22 Dec 2011 21:34:30 +0200 [thread overview] Message-ID: <1324582474-18181-6-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1324582474-18181-1-git-send-email-peter.ujfalusi@ti.com> 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: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/omap/omap-abe-twl6040.c | 46 ++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 18a25b0..cf3cb08 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -113,38 +113,48 @@ static struct snd_soc_jack_pin hs_jack_pins[] = { /* SDP4430 machine DAPM */ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { - SND_SOC_DAPM_MIC("Ext Mic", NULL), - SND_SOC_DAPM_SPK("Ext Spk", NULL), - SND_SOC_DAPM_MIC("Headset Mic", NULL), + /* Outputs */ SND_SOC_DAPM_HP("Headset Stereophone", 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[] = { - /* External Mics: MAINMIC, SUBMIC with bias*/ - {"MAINMIC", NULL, "Ext Mic"}, - {"SUBMIC", NULL, "Ext Mic"}, - {"Ext Mic", NULL, "Main Mic Bias"}, + /* Routings for outputs */ + {"Headset Stereophone", NULL, "HSOL"}, + {"Headset Stereophone", NULL, "HSOR"}, + + {"Earphone Spk", NULL, "EP"}, - /* External Speakers: HFL, HFR */ {"Ext Spk", NULL, "HFL"}, {"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"}, {"Headset Mic", NULL, "Headset Mic Bias"}, - /* Headset Stereophone (Headphone): HSOL, HSOR */ - {"Headset Stereophone", NULL, "HSOL"}, - {"Headset Stereophone", NULL, "HSOR"}, + {"MAINMIC", NULL, "Main Handset Mic"}, + {"Main Handset Mic", NULL, "Main Mic Bias"}, - /* Earphone speaker */ - {"Earphone Spk", NULL, "EP"}, + {"SUBMIC", NULL, "Sub Handset Mic"}, + {"Sub Handset Mic", NULL, "Main Mic Bias"}, - /* Aux/FM Stereo In: AFML, AFMR */ - {"AFML", NULL, "FM Stereo In"}, - {"AFMR", NULL, "FM Stereo In"}, + {"AFML", NULL, "Line In"}, + {"AFMR", NULL, "Line In"}, }; static int omapabe_twl6040_init(struct snd_soc_pcm_runtime *rtd) -- 1.7.8.1
WARNING: multiple messages have this Message-ID (diff)
From: peter.ujfalusi@ti.com (Peter Ujfalusi) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 5/9] ASoC: omap-abe-twl6040: Add complete DAPM routing Date: Thu, 22 Dec 2011 21:34:30 +0200 [thread overview] Message-ID: <1324582474-18181-6-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1324582474-18181-1-git-send-email-peter.ujfalusi@ti.com> 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: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/omap/omap-abe-twl6040.c | 46 ++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 18a25b0..cf3cb08 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -113,38 +113,48 @@ static struct snd_soc_jack_pin hs_jack_pins[] = { /* SDP4430 machine DAPM */ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { - SND_SOC_DAPM_MIC("Ext Mic", NULL), - SND_SOC_DAPM_SPK("Ext Spk", NULL), - SND_SOC_DAPM_MIC("Headset Mic", NULL), + /* Outputs */ SND_SOC_DAPM_HP("Headset Stereophone", 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[] = { - /* External Mics: MAINMIC, SUBMIC with bias*/ - {"MAINMIC", NULL, "Ext Mic"}, - {"SUBMIC", NULL, "Ext Mic"}, - {"Ext Mic", NULL, "Main Mic Bias"}, + /* Routings for outputs */ + {"Headset Stereophone", NULL, "HSOL"}, + {"Headset Stereophone", NULL, "HSOR"}, + + {"Earphone Spk", NULL, "EP"}, - /* External Speakers: HFL, HFR */ {"Ext Spk", NULL, "HFL"}, {"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"}, {"Headset Mic", NULL, "Headset Mic Bias"}, - /* Headset Stereophone (Headphone): HSOL, HSOR */ - {"Headset Stereophone", NULL, "HSOL"}, - {"Headset Stereophone", NULL, "HSOR"}, + {"MAINMIC", NULL, "Main Handset Mic"}, + {"Main Handset Mic", NULL, "Main Mic Bias"}, - /* Earphone speaker */ - {"Earphone Spk", NULL, "EP"}, + {"SUBMIC", NULL, "Sub Handset Mic"}, + {"Sub Handset Mic", NULL, "Main Mic Bias"}, - /* Aux/FM Stereo In: AFML, AFMR */ - {"AFML", NULL, "FM Stereo In"}, - {"AFMR", NULL, "FM Stereo In"}, + {"AFML", NULL, "Line In"}, + {"AFMR", NULL, "Line In"}, }; static int omapabe_twl6040_init(struct snd_soc_pcm_runtime *rtd) -- 1.7.8.1
next prev parent reply other threads:[~2011-12-22 19:35 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-12-22 19:34 [PATCH v3 0/9] OMAP4: ASoC: Support for PandaBoard family Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-22 19:34 ` [PATCH v3 1/9] include: platform_data: Platform data header for OMAP4 ASoC audio Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-23 10:37 ` Mark Brown 2011-12-23 10:37 ` Mark Brown 2011-12-22 19:34 ` [PATCH v3 2/9] OMAP4: 4430sdp: Register platform device for OMAP4 audio Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-22 19:37 ` Tony Lindgren 2011-12-22 19:37 ` Tony Lindgren 2011-12-23 6:13 ` Shilimkar, Santosh 2011-12-23 6:13 ` Shilimkar, Santosh 2011-12-22 19:34 ` [PATCH v3 3/9] ASoC: omap-abe-twl6040: Convert to platform deriver Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-22 19:34 ` [PATCH v3 4/9] ASoC: twl6040: Convert MICBIAS to SUPPLY widget Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi [this message] 2011-12-22 19:34 ` [PATCH v3 5/9] ASoC: omap-abe-twl6040: Add complete DAPM routing Peter Ujfalusi 2011-12-22 19:34 ` [PATCH v3 6/9] ASoC: omap-abe-twl6040: DAI link selection based on platform data Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-22 19:34 ` [PATCH v3 7/9] ASoC: omap-abe-twl6040: Configure card according to " Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-22 19:34 ` [PATCH v3 8/9] OMAP4: omap4panda: Enable audio support Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi 2011-12-22 19:38 ` Tony Lindgren 2011-12-22 19:38 ` Tony Lindgren 2011-12-23 6:13 ` Shilimkar, Santosh 2011-12-23 6:13 ` Shilimkar, Santosh 2011-12-22 19:34 ` [PATCH v3 9/9] ASoC: Kconfig: OMAP4: Enable support for PandaBoards Peter Ujfalusi 2011-12-22 19:34 ` Peter Ujfalusi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1324582474-18181-6-git-send-email-peter.ujfalusi@ti.com \ --to=peter.ujfalusi@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=lrg@ti.com \ --cc=misael.lopez@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.